Revert "Issue #45 fix"

This reverts commit ae6b8459020bb47b989a17cf382f8c43fa631056.
Revert "Revert "Issue #45 fix""

This reverts commit a1989bfe980c190befb1dbfaadad898c69f6e104.