diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index 4d6479f7e..e662492ea 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -145,10 +145,9 @@ const char *CONFIG_AnalogNumToName(int32_t func)
 ===================
 */
 
-void CONFIG_SetDefaultKeys(int32_t type)
+void CONFIG_SetDefaultKeys(const char (*keyptr)[MAXGAMEFUNCLEN])
 {
     int32_t i,f;
-    const char (*keyptr)[MAXGAMEFUNCLEN] = type ? oldkeydefaults : keydefaults;
 
     Bmemset(ud.config.KeyboardKeys, 0xff, sizeof(ud.config.KeyboardKeys));
 
@@ -271,7 +270,7 @@ void CONFIG_SetDefaults(void)
 
     // JBF 20031211
 
-    CONFIG_SetDefaultKeys(0);
+    CONFIG_SetDefaultKeys((const char (*)[MAXGAMEFUNCLEN])keydefaults);
 
     memset(ud.config.MouseFunctions, -1, sizeof(ud.config.MouseFunctions));
     for (i=0; i<MAXMOUSEBUTTONS; i++)
diff --git a/polymer/eduke32/source/config.h b/polymer/eduke32/source/config.h
index fc24afa41..5c1d239f5 100644
--- a/polymer/eduke32/source/config.h
+++ b/polymer/eduke32/source/config.h
@@ -30,7 +30,7 @@ void CONFIG_GetSetupFilename( void );
 void CONFIG_WriteSetup(uint32_t flags);
 void CONFIG_SetupMouse( void );
 void CONFIG_SetupJoystick( void );
-void CONFIG_SetDefaultKeys(int32_t type);
+void CONFIG_SetDefaultKeys(const char (*keyptr)[MAXGAMEFUNCLEN]);
 
 int32_t CONFIG_GetMapBestTime(char *mapname);
 int32_t CONFIG_SetMapBestTime(char *mapname, int32_t tm);
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index f93efa204..a240e2665 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -3679,12 +3679,12 @@ cheat_for_port_credits2:
         }
         else if (x == NUMGAMEFUNCTIONS)
         {
-            CONFIG_SetDefaultKeys(0);
+            CONFIG_SetDefaultKeys((const char (*)[MAXGAMEFUNCLEN])keydefaults);
             break;
         }
         else if (x == NUMGAMEFUNCTIONS+1)
         {
-            CONFIG_SetDefaultKeys(1);
+            CONFIG_SetDefaultKeys(oldkeydefaults);
             break;
         }
         else if (x>=0)