Assembly save fix