diff --git a/mapchooser_extended/scripting/mapchooser_extended_avg_mapend.sp b/mapchooser_extended/scripting/mapchooser_extended_avg_mapend.sp
index da1e7ca..a4d1830 100755
--- a/mapchooser_extended/scripting/mapchooser_extended_avg_mapend.sp
+++ b/mapchooser_extended/scripting/mapchooser_extended_avg_mapend.sp
@@ -630,9 +630,9 @@ public void OnMapEnd()
     static char map[PLATFORM_MAX_PATH];
     int Cooldown;
 
+    GetCurrentMap(map, PLATFORM_MAX_PATH);
     if(g_SaveCDOnMapEnd)
     {
-        GetCurrentMap(map, PLATFORM_MAX_PATH);
         Cooldown = InternalGetMapCooldown(map);
         g_OldMapList.SetValue(map, Cooldown, true);
 
@@ -663,6 +663,7 @@ public void OnMapEnd()
         if(Cooldown < GetTime())
             g_TimeMapList.Remove(map);
     }
+    delete TimeMapListSnapshot;
     delete OldMapListSnapshot;
 
     InternalStoreMapCooldowns();