diff --git a/src/killer_sokoban/Main.java b/src/killer_sokoban/Main.java
index 14286717352d7b6083ca748338c5fe6217f20f43..5453670178ff1840c7d31185252ac8b42b32bb71 100644
--- a/src/killer_sokoban/Main.java
+++ b/src/killer_sokoban/Main.java
@@ -44,15 +44,11 @@ public class Main {
 	}
 	
 	public static String getMoveableName(Moveable m)
-	{		
-		if (m instanceof Crate) //Jobb ötlete valakinek?
-		{
-			return getKeyByValue(crates, (Crate) m);
-		}
-		else
-		{
-			return getKeyByValue(workers, (Worker) m);
-		}
+	{
+		HashMap<String, Moveable> moveables = new HashMap<>(workers);
+		moveables.putAll(crates);
+		
+		return getKeyByValue(moveables, m);
 	}
 	
 	public static void deleteWorker(Worker w)