Corrected problems with restoring set from a previous session.