Revert "Fixed issue #79"

This reverts commit 4f6537d9bc78017f1805c8c47c8cce31af462d7f.