Revert "Correct Bug #7"

This reverts commit ff49a48f86ca076b9cc86b63aac8c5f40393d40a.