Revert "Fix issue #4"

This reverts commit ab7a7ffa47f61dc3281d9ff590c9677575cfa470.