Fix proposal for #66