Is there a solution to the issue where a clause substitution to the main agreement changes the clause style formatting in the main agreement, which then has to be manually re-adjusted in the main agreement?

  When you make a change in
the clause library to a clause and ‘substitute’ the clause change back into the
master agreement the clause style information is lost and you have to reformat
the clause text to its original style and fonts etc. manually.  Is there
any way to fix this?  Are we really required to manually format the master agreement, commit the change to the document, and
save it.

And, given this issue, is it best to make all clause changes in the master agreement first, delete the clause in the library and publish the new clause to the library?  We were hoping to be able to start the clause change in the library first, but hit this issue.

Thanks!