Correct Bug #8