Fixed border coloring issue