Fix loading save instance state