Fix InvalidOperation if value is ''