Bugfix for save/resume in Hybrid mode. If we are about to abort,
we must not call parent's fix_state(). Closes #823.