Revert "Fix Issue #40"

This reverts commit b76032729dbef7e6d51666e809de82cfa555cb3e.