Fix save back to Factory