Fix for the new color picker