Fixed server side collision detection