Fixed Collision detection