Fixed color change issue