Victor's fix for commitments