Revert "Fix for issue #114"

This reverts commit 21bc72023b3254824bf9a6f1cdc5d53159ad564f.
Correct fix for issue #114