Fixed colour handling