Proposed fix for Bug 705503