Fix color issue