Fix color generation