Fixed evaluation not extracting values correctly