Fix the color issue