border fix - take 4