Fix color conversion