Fixed collision detection v6