Collision should work correctly now