Revert "Fixed issue #94"

This reverts commit 42942ef2d59c20401376e125e084cc41fa07e2b6.