diff --git a/mapchooser_extended/scripting/mapchooser_extended_avg_mapend.sp b/mapchooser_extended/scripting/mapchooser_extended_avg_mapend.sp
index 0e9058e..fa47ed4 100755
--- a/mapchooser_extended/scripting/mapchooser_extended_avg_mapend.sp
+++ b/mapchooser_extended/scripting/mapchooser_extended_avg_mapend.sp
@@ -991,7 +991,7 @@ public Action CS_OnTerminateRound(float &delay, CSRoundEndReason &reason)
             InitiateVote(MapChange_Instant); //feature so mapvote happens at actual mapend
         }
         delay = float(total_time);
-        CreateTimer(0.1, Timer_set_move_type);
+        CreateTimer(1.0, Timer_set_move_type);
         return Plugin_Changed;
     }
     g_DidRoundTerminate = false;
@@ -1000,7 +1000,7 @@ public Action CS_OnTerminateRound(float &delay, CSRoundEndReason &reason)
 
 public Action Timer_set_move_type(Handle hTimer, Handle dp)
 {
-    for (int i = 1; i < MaxClients; i++)
+    for (int i = 1; i <= MaxClients; i++)
     {
         if (IsValidClient(i))
         {