Border color fix