diff --git a/code/game/g_items.c b/code/game/g_items.c
index c1d101b..0a4d5ec 100644
--- a/code/game/g_items.c
+++ b/code/game/g_items.c
@@ -828,9 +828,9 @@ void ClearRegisteredItems( void ) {
 	memset( itemRegistered, 0, sizeof( itemRegistered ) );
 
 	if(g_instantgib.integer || g_weaponarena.integer == 7) {
-            if(g_instantgib.integer & 2)
+            if(g_instantgib.integer & 2) {
                 RegisterItem( BG_FindItemForWeapon( WP_GAUNTLET ) );
-            //RegisterItem( BG_FindItemForWeapon( WP_MACHINEGUN ) );
+	    }
             RegisterItem( BG_FindItemForWeapon( WP_RAILGUN ) );
 	}
         else
@@ -850,7 +850,7 @@ void ClearRegisteredItems( void ) {
 		RegisterItem( BG_FindItemForWeapon( WP_PLASMAGUN ) );
 	} else if (g_weaponarena.integer == 9) {
 		RegisterItem( BG_FindItemForWeapon( WP_BFG ) );
-	} else if (g_weaponarena.integer == 10) {
+	} else if (g_weaponarena.integer == 10 || g_instantgib.integer & 3) {
 		RegisterItem( BG_FindItemForWeapon( WP_NAILGUN ) );
 	} else if (g_weaponarena.integer == 11) {
 		RegisterItem( BG_FindItemForWeapon( WP_PROX_LAUNCHER ) );