fix Bug 921404 uplift