temp save fix bugs