Minor fix to when borders are added, specifically for 2.2.