Bug 951565 with fix