fix SavedInstance

separate in two methods