diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 791394392..842f543ee 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -366,9 +366,8 @@ const machine_t machines[] = {
     { "[ACC 2168] Packard Bell PB410A",		"pb410a",		MACHINE_TYPE_486_S2,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 4096, 36864, 1024, 127,	       machine_at_pb410a_init, NULL			},
     /* Uses an ACER/NEC 90M002A (UPD82C42C, 8042 clone) with unknown firmware (V4.01H). */
     { "[ALi M1429G] Acer A1G",			"acera1g",		MACHINE_TYPE_486_S2,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 4096, 36864, 1024, 127,	      machine_at_acera1g_init, at_acera1g_get_device	},
-    /* There are two similar BIOS strings with -H, and one with -U, so I'm going to
-        give it an AMIKey H KBC firmware. */
-    { "[ALi M1429G] Kaimei 486",		"win486",		MACHINE_TYPE_486_S2,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	  machine_at_winbios1429_init, NULL			},
+    /* This has an AMIKey-2, which is an updated version of type 'H'. */
+    { "[ALi M1429G] Kaimei SA-486 VL-BUS M.B.",	"win486",		MACHINE_TYPE_486_S2,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	  machine_at_winbios1429_init, NULL			},
     /* Uses an Intel KBC with Phoenix MultiKey KBC firmware. */
     { "[SiS 461] DEC DECpc LPV",		"decpclpv",		MACHINE_TYPE_486_S2,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 1024, 32768, 1024, 127,	     machine_at_decpclpv_init, NULL			},
     /* Uses an NEC 90M002A (UPD82C42C, 8042 clone) with unknown firmware. */
@@ -1010,7 +1009,11 @@ machine_get_min_ram(int m)
 int
 machine_get_max_ram(int m)
 {
-    return(machines[m].max_ram);
+#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
+    return MIN(((int) machines[m].max_ram), 2097152);
+#else
+    return MIN(((int) machines[m].max_ram), 3145728);
+#endif
 }
 
 
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 1221e0a34..5d977ba1d 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -802,12 +802,7 @@ win_settings_machine_recalc_machine(HWND hdlg)
     } else {
 	/* MB granularity */
 	h = GetDlgItem(hdlg, IDC_MEMSPIN);
-#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
-	i = MIN(machine_get_max_ram(temp_machine), 2097152);
-#else
-	i = MIN(machine_get_max_ram(temp_machine), 3145728);
-#endif
-	SendMessage(h, UDM_SETRANGE, 0, (machine_get_min_ram(temp_machine) << 6) | (i >> 10));
+	SendMessage(h, UDM_SETRANGE, 0, (machine_get_min_ram(temp_machine) << 6) | (machine_get_max_ram(temp_machine) >> 10));
 
 	accel.nSec = 0;
 	accel.nInc = machine_get_ram_granularity(temp_machine) >> 10;