Adding fix to color picker after merge