Proposal to #178