Correct bug #6