[FIX] model changed to many2many
[MERGE] with pauls