fix with pre persist saving