Correction of crash on restore