Additional fix to many-to-many association