I did this proposal in #34