Revert "Fixes issue #1"

This reverts commit 6c797aaabb30e73b09c9fc6cc154ce2be50d7eaf.