Proposal to #67