Fix color bug