Many to many persistence issue fix