fixed many to many mappings