Revert "partial fix for issue #111"

This reverts commit 587567809ad3222297ad755eda6d2f4afec8ed01.