Fix many-to-many relationship