Fix color logic