Proposal to #79