diff --git a/src/mem.c b/src/mem.c
index 8e9f75455..ffc4026c9 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -12,7 +12,7 @@
  *		the DYNAMIC_TABLES=1 enables this. Will eventually go
  *		away, either way...
  *
- * Version:	@(#)mem.c	1.0.16	2018/10/15
+ * Version:	@(#)mem.c	1.0.17	2018/10/17
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -1723,8 +1723,7 @@ mem_reset(void)
 	}
     } else {
 	/* 8088/86; maximum address space is 1MB. */
-	/* m = 256; */
-	m = 512;	/* This is to accomodate the T1200 which can take up to 2 MB of RAM. */
+	m = 256;
     }
 
     /*
@@ -1907,6 +1906,9 @@ mem_reset_page_blocks(void)
     if (pages == NULL) return;
 
     for (c = 0; c < ((mem_size * 1024) >> 12); c++) {
+	if (c >= pages_sz)
+		break;
+
 	pages[c].write_b = mem_write_ramb_page;
 	pages[c].write_w = mem_write_ramw_page;
 	pages[c].write_l = mem_write_raml_page;