Fixed Color issue