Fixed issue with many to many