Fixes Issue#1169, finish the from_val case not included in PR#1170
#1184
+5
−5
from_val case not included in PR#1170
#1184