#948 - ensuring name value pair are both updated. (previous fixed replaced both with just the value)