Fix proposal: [fbd5c85c05]