Fixed Coloring issue