Estimating addons Saved to template being duplicated on totals page

SUGGESTED

Ever since we updated to version 23 we have been having issues with the addons that are already saved in the DB being asked to save again (duplicating) when saving the template.  If we save these addons it creates new entries with new addons numbers.  When we load the template again, those addons get doubled up in the totals page causing calculation issues.  We can remove them from the totals page but I do not believe this is expected behavior as the addons that are being asked to save back to the DB are exactly the same as the addons we pulled fromt he DB.

Anyone else having this issue?