Fix bug where transitioning from a combined state exploded.