Revert "Fix issue #97"

This reverts commit 18e250aec7dc8ddb98bc9e8863dae40c590ed332.