Fixing multi resave