diff --git a/modern-language-association.csl b/modern-language-association.csl
index 170f16a3b7d..db5ca58db1b 100755
--- a/modern-language-association.csl
+++ b/modern-language-association.csl
@@ -89,26 +89,40 @@
     <text variable="container-title" font-style="italic" text-case="title"/>
   </macro>
   <macro name="other-contributors">
-    <group delimiter=", ">
-      <choose>
-        <if variable="container-title" match="any">
-          <names variable="container-author editor illustrator interviewer translator" delimiter=", ">
+    <choose>
+      <if variable="container-title" match="any">
+        <group delimiter=", ">
+          <names variable="container-author" delimiter=", ">
             <label form="verb" suffix=" "/>
             <name and="text"/>
           </names>
-        </if>
-        <else>
-          <names variable="container-author editor illustrator interviewer translator" delimiter=", ">
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text"/>
+          </names>
+          <names variable="director illustrator interviewer" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text"/>
+          </names>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <names variable="container-author" delimiter=", ">
             <label form="verb" suffix=" " text-case="capitalize-first"/>
             <name and="text"/>
           </names>
-        </else>
-      </choose>
-      <names variable="director">
-        <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name and="text"/>
-      </names>
-    </group>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text"/>
+          </names>
+          <names variable="director illustrator interviewer" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text"/>
+          </names>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="version">
     <group delimiter=", ">