Fix colour handling