fixed color issues