Proposal to #90