Fixed the color issue