Maybe fixed collision detection