Fix color problem