Fixed colour bug once and for all