Revert "Correct Bug #8"

This reverts commit cd109a178b1abddedca18bd9507455404dac9aeb.