Revert "Fix for issue #1"

This reverts commit 52f00043676d63a15b5cfc591f1058bb4a6de033.