Proposal to #174