Fix proposal for #61