Fixed map collision detection