Full fix for Bug 471