Fixing many-to-many association