Revert "fix issue #40"

This reverts commit a0a8c0cd75fe2b4b6ab0082757aab404b4a34af5.