Fixed client collision detection