Fix color change