I agree that it can be a followup PR. At the very least let's get this "colour" problem fixed.