Fixed color issue