Collision fix