Revert "fixes #67, tests passed"

This reverts commit 1ac207592c80e6c83389013315d8bfd04b356eb6.