fixed color bugs