diff --git a/src/MapRenderer.cpp b/src/MapRenderer.cpp
index 4aa99967..60480baa 100644
--- a/src/MapRenderer.cpp
+++ b/src/MapRenderer.cpp
@@ -568,9 +568,12 @@ int MapRenderer::load(string filename) {
 }
 
 void MapRenderer::clearQueues() {
-	enemies.clear();
-	npcs.clear();
-	loot.clear();
+	while(!enemies.empty())
+	  enemies.pop();
+	while(!npcs.empty())
+	  npcs.pop();
+	while(!loot.empty())
+	  loot.pop();
 }
 
 /**