Fix save&restart