Restore from saved state correctly