Fixed state saving (again)