Fixed state restoration.