Many to many relation fix