Save and recall bugfix