Fix undefined name "Value"
Merge branch 'mnaberez-fix-value-undefined'