Fixed move state saving