Fixed color bug