Make latest color-space version work