fixed color handling