Fixed color ordering issue