Fix a potential bug in SetupFromSave