3 2 fix association auto save