Revert "fix to issue #9"

This reverts commit b08f6b7603ee23fa6f0991e40d264ac781cadf47.