Fix color related bug