Fixed colour problem at last