Change the save state to use only the current frame for restore