Fix proposal for Bug 359104