fixed bugs from merge in value-set.js