fixed collision detection a bit