Fixed collision detection!