Revert "Fixing issue #207"

This reverts commit 6357fbcd770bc7ec4a7382bcfc51957ffa2a7b73.