Fixed bug introduced with color support