Fix ColorPicker bug