- Fix another Name/Value issue