Revert "Fix issue #98"

This reverts commit a08d9a1f523f256eff18d4ee48a12db4828740b4.