color => baseColor fix