Fix proposal for 380140