values. Also resolves #699

(cherry picked from commit 199ac98b31f84408dd9c9a2a923d7ddbd1c385f6)