Proposal to #155