Proposal to #79 and #47