Second try at fix for Bug 4.