Fix failing transitions preventing certain future transitions

A much neater fix than #44.