--- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c.orig	2008-07-08 11:46:18.000000000 +0200
+++ nx-X11/programs/Xserver/hw/nxagent/Keyboard.c	2008-07-08 11:54:32.000000000 +0200
@@ -444,7 +444,7 @@
                                      max_keycode - min_keycode + 1,
                                      &mapWidth);
 
-        if (keymap == NULL)
+        if (keymap64 == NULL)
         {
           XFreeModifiermap(modifier_keymap);
 
