fix clone behavior by saving immediately after the clone