Revert "Correct Bug #6"

This reverts commit b415e0ef39d900987b61612af80fc874b3cdfdb1.