diff --git a/MapRestartWorkaround/main.gsc b/MapRestartWorkaround/main.gsc
index 38a61ed..56b9fc4 100644
--- a/MapRestartWorkaround/main.gsc
+++ b/MapRestartWorkaround/main.gsc
@@ -20,15 +20,9 @@ initialMapRestart()
 
 gscRestart()
 {
-    while ( 1 )
-    {
-        if ( level.intermission )
-        {
-            wait 20; //20 is ideal
-            map_restart( false );
-        }
-        wait 1;
-    }
+	level waittill( "end_game" );
+      	wait 20; //20 is ideal
+        map_restart( false );
 }
 
 killAllPlayers()
@@ -77,4 +71,4 @@ spawnAllPlayers()
 		i++;
 	}
 	level.no_end_game_check = 0;
-}
\ No newline at end of file
+}