Issue #2 corrected
Revert "Issue #2 corrected"

This reverts commit 881624f150fa6095602b61869475e59fbcb3d4f2.