Fixed collision detection v7