Fix color support