Update to fix new “too many values” issue