Proposal to #156