borders bug fix