Proposal to #165