#122 Fixed the save/restore content