Evaluating `current-property` value in the right context. Fixes #1561