Revert "Fixes issue #25"

This reverts commit 4e1d5edb54047150362d75adbd842aa61d60a010.
yet another attempt to fix issue #25