Fix to bug #681
Merge pull request #695 from helmanofer/patch-2

Fix to bug #681