diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java
index ca3aedb..d8cace9 100644
--- a/src/main/java/cactusServer/models/CollisionManager.java
+++ b/src/main/java/cactusServer/models/CollisionManager.java
@@ -11,6 +11,7 @@
 
 import cactusServer.entities.Character;
 import cactusServer.entities.Instance;
+import cactusServer.entities.Object;
 
 public class CollisionManager {
 	private static CollisionManager theInstance;
@@ -33,16 +34,15 @@
 		return result;
 	}
 
-	@SuppressWarnings("unlikely-arg-type")
 	public void collisionRun() {
-		result.clear();
 		for (Map.Entry<String, Instance> instance : instances.entrySet()) {
-			HashMap<String, cactusServer.entities.Object> objects = instance.getValue().getObjects();
-			HashMap<String,Character> characters = instance.getValue().getCharacters();
-			for (Map.Entry<String, cactusServer.entities.Object> object : objects.entrySet()) {
+			result.clear();
+			HashMap<String, Object> objects = instance.getValue().getObjects();
+			HashMap<String, Character> characters = instance.getValue().getCharacters();
+			for (Map.Entry<String, Object> object : objects.entrySet()) {
 				for (Map.Entry<String, Character> character : characters.entrySet()) {
-					result.add(PhysicsUtility.checkCollision(, "",
-							instances.get(i).getObjects().get(j).getObject(), ""));
+					result.add(PhysicsUtility.checkCollision(character.getValue().getObject(), "",
+							object.getValue().getObject(), ""));
 				}
 			}
 		}