Edge-collision fix