Fix proposal handling