border fix - take 3