Fix new auto-color code