Added flag check before restoring claim