Fix for SavedStates