Fix for color picker