Proposal for #309