--- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c 2008-03-12 11:03:43.000000000 -0700 +++ nx-X11/programs/Xserver/hw/nxagent/Keyboard.c.new 2008-12-08 15:02:04.000000000 -0800 @@ -444,7 +444,7 @@ max_keycode - min_keycode + 1, &mapWidth); - if (keymap == NULL) + if (keymap64 == NULL) { XFreeModifiermap(modifier_keymap);