Fixes #1213 in getting of values