1 files changed, 3 insertions, 1 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 9eef409..7271f22 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -27,7 +27,8 @@ public class Map extends Board
     {
         getHexAt(currentHex, x, y);
         if (currentHex.x != -1) {
-            currentPawn = getTopPawnAt(currentHex);
+            currentPawn = removeTopPawnFrom(currentHex);
+            if (currentPawn != null) pawnsToDraw.add(currentPawn);
         }
     }
 
@@ -35,6 +36,7 @@ public class Map extends Board
     {
         getHexAt(currentHex, x, y);
         if (currentPawn != null) {
+            pawnsToDraw.remove(currentPawn);
             movePawnTo(currentPawn, currentHex);
         }
     }