diff --git a/TeXZilla.jison b/TeXZilla.jison
index 3e83ec1..8c1c258 100644
--- a/TeXZilla.jison
+++ b/TeXZilla.jison
@@ -843,31 +843,33 @@ closedTermList
   }
   ;
 
+superScript
+  : "^" closedTerm {
+    $$ = $2;
+}
+  | OPP {
+    $$ = newMo($1);
+}
+  | OPP "^" closedTerm {
+    $$ = newTag("mrow", newMo($1) + $3);
+};
+
 /* compound terms (closed terms with scripts) */
 compoundTerm
   : TENSOR closedTerm subsupList {
     $$ = newTag("mmultiscripts", $2 + $3);
   }
-  | closedTerm "_" closedTerm "^" closedTerm {
-    $$ = newScript(false, $1, $3, $5);
+  | closedTerm "_" closedTerm superScript {
+    $$ = newScript(false, $1, $3, $4);
   }
-  | closedTerm "_" closedTerm OPP {
-    $$ = newScript(false, $1, $3, newMo($4));
-  }
-  | closedTerm "^" closedTerm "_" closedTerm {
-    $$ = newScript(false, $1, $5, $3);
-  }
-  | closedTerm OPP "_" closedTerm {
-    $$ = newScript(false, $1, $4, newMo($2));
+  | closedTerm superScript "_" closedTerm {
+    $$ = newScript(false, $1, $4, $2);
   }
   | closedTerm "_" closedTerm {
     $$ = newScript(false, $1, $3, null);
   }
-  | closedTerm "^" closedTerm {
-    $$ = newScript(false, $1, null, $3);
-  }
-  | closedTerm OPP {
-    $$ = newScript(false, $1, null, newMo($2));
+  | closedTerm superScript {
+    $$ = newScript(false, $1, null, $2);
   }
   | closedTerm { $$ = $1; }
   | opm "_" closedTerm "^" closedTerm {
diff --git a/unit-tests.js b/unit-tests.js
index 1c214d7..f070172 100644
--- a/unit-tests.js
+++ b/unit-tests.js
@@ -37,6 +37,10 @@ var tests = [
     ["a_{b c}^{d e}", '<math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><msubsup><mi>a</mi><mrow><mi>b</mi><mi>c</mi></mrow><mrow><mi>d</mi><mi>e</mi></mrow></msubsup><annotation encoding="TeX">a_{b c}^{d e}</annotation></semantics></math>'],
     /* subscripts and primes */
     ["a_1' + b'_2 = c'", '<math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><msubsup><mi>a</mi><mn>1</mn><mo>′</mo></msubsup><mo>+</mo><msubsup><mi>b</mi><mn>2</mn><mo>′</mo></msubsup><mo>=</mo><msup><mi>c</mi><mo>′</mo></msup></mrow><annotation encoding="TeX">a_1\' + b\'_2 = c\'</annotation></semantics></math>'],
+    /* primes and superscripts */
+    ["a'^b", '<math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><msup><mi>a</mi><mrow><mo>′</mo><mi>b</mi></mrow></msup><annotation encoding="TeX">a\'^b</annotation></semantics></math>'],
+    ["a'^{bc}_2", '<math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><msubsup><mi>a</mi><mn>2</mn><mrow><mo>′</mo><mrow><mi>b</mi><mi>c</mi></mrow></mrow></msubsup><annotation encoding="TeX">a\'^{bc}_2</annotation></semantics></math>'],
+    ["a_2'^b", '<math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><msubsup><mi>a</mi><mn>2</mn><mrow><mo>′</mo><mi>b</mi></mrow></msubsup><annotation encoding="TeX">a_2\'^b</annotation></semantics></math>'],
     /* Functions */
     ["\\arccos \\arcsin \\arctan \\arg \\cos \\cosh \\cot \\coth \\csc \\deg \\dim  \\exp \\hom \\ker \\lg \\ln \\log \\sec \\sin \\sinh \\tan \\tanh \\det \\gcd \\inf \\lim \\liminf \\limsup \\max \\min \\Pr \\sup", '<math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mo lspace="0em" rspace="0em">arccos</mo><mo lspace="0em" rspace="0em">arcsin</mo><mo lspace="0em" rspace="0em">arctan</mo><mo lspace="0em" rspace="0em">arg</mo><mo lspace="0em" rspace="0em">cos</mo><mo lspace="0em" rspace="0em">cosh</mo><mo lspace="0em" rspace="0em">cot</mo><mo lspace="0em" rspace="0em">coth</mo><mo lspace="0em" rspace="0em">csc</mo><mo lspace="0em" rspace="0em">deg</mo><mo lspace="0em" rspace="0em">dim</mo><mo lspace="0em" rspace="0em">exp</mo><mo lspace="0em" rspace="0em">hom</mo><mo lspace="0em" rspace="0em">ker</mo><mo lspace="0em" rspace="0em">lg</mo><mo lspace="0em" rspace="0em">ln</mo><mo lspace="0em" rspace="0em">log</mo><mo lspace="0em" rspace="0em">sec</mo><mo lspace="0em" rspace="0em">sin</mo><mo lspace="0em" rspace="0em">sinh</mo><mo lspace="0em" rspace="0em">tan</mo><mo lspace="0em" rspace="0em">tanh</mo><mo lspace="0em" rspace="0em">det</mo><mo lspace="0em" rspace="0em">gcd</mo><mo lspace="0em" rspace="0em">inf</mo><mo lspace="0em" rspace="0em">lim</mo><mo lspace="0em" rspace="0em">liminf</mo><mo lspace="0em" rspace="0em">limsup</mo><mo lspace="0em" rspace="0em">max</mo><mo lspace="0em" rspace="0em">min</mo><mo lspace="0em" rspace="0em">Pr</mo><mo lspace="0em" rspace="0em">sup</mo></mrow><annotation encoding="TeX">\\arccos \\arcsin \\arctan \\arg \\cos \\cosh \\cot \\coth \\csc \\deg \\dim  \\exp \\hom \\ker \\lg \\ln \\log \\sec \\sin \\sinh \\tan \\tanh \\det \\gcd \\inf \\lim \\liminf \\limsup \\max \\min \\Pr \\sup</annotation></semantics></math>'], 
     ["\\arccos_1 \\arcsin^2 \\arctan_1^2 \\arg^2_1 \\cos_1 \\cosh^2 \\cot_1^2 \\coth^2_1 \\csc_1 \\deg^2 \\dim_1^2  \\exp^2_1 \\hom_1 \\ker^2 \\lg_1^2 \\ln^2_1 \\log_1 \\sec^2 \\sin_1^2 \\sinh^2_1 \\tan_1 \\tanh^2 \\det_1^2 \\gcd^2_1 \\inf_1 \\lim^2 \\liminf_1^2 \\limsup^2_1 \\max_1 \\min^2 \\Pr_1^2 \\sup^2_1", '<math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><msub><mo lspace="0em" rspace="0em">arccos</mo><mn>1</mn></msub><msup><mo lspace="0em" rspace="0em">arcsin</mo><mn>2</mn></msup><msubsup><mo lspace="0em" rspace="0em">arctan</mo><mn>1</mn><mn>2</mn></msubsup><msubsup><mo lspace="0em" rspace="0em">arg</mo><mn>1</mn><mn>2</mn></msubsup><msub><mo lspace="0em" rspace="0em">cos</mo><mn>1</mn></msub><msup><mo lspace="0em" rspace="0em">cosh</mo><mn>2</mn></msup><msubsup><mo lspace="0em" rspace="0em">cot</mo><mn>1</mn><mn>2</mn></msubsup><msubsup><mo lspace="0em" rspace="0em">coth</mo><mn>1</mn><mn>2</mn></msubsup><msub><mo lspace="0em" rspace="0em">csc</mo><mn>1</mn></msub><msup><mo lspace="0em" rspace="0em">deg</mo><mn>2</mn></msup><msubsup><mo lspace="0em" rspace="0em">dim</mo><mn>1</mn><mn>2</mn></msubsup><msubsup><mo lspace="0em" rspace="0em">exp</mo><mn>1</mn><mn>2</mn></msubsup><msub><mo lspace="0em" rspace="0em">hom</mo><mn>1</mn></msub><msup><mo lspace="0em" rspace="0em">ker</mo><mn>2</mn></msup><msubsup><mo lspace="0em" rspace="0em">lg</mo><mn>1</mn><mn>2</mn></msubsup><msubsup><mo lspace="0em" rspace="0em">ln</mo><mn>1</mn><mn>2</mn></msubsup><msub><mo lspace="0em" rspace="0em">log</mo><mn>1</mn></msub><msup><mo lspace="0em" rspace="0em">sec</mo><mn>2</mn></msup><msubsup><mo lspace="0em" rspace="0em">sin</mo><mn>1</mn><mn>2</mn></msubsup><msubsup><mo lspace="0em" rspace="0em">sinh</mo><mn>1</mn><mn>2</mn></msubsup><msub><mo lspace="0em" rspace="0em">tan</mo><mn>1</mn></msub><msup><mo lspace="0em" rspace="0em">tanh</mo><mn>2</mn></msup><munderover><mo lspace="0em" rspace="0em">det</mo><mn>1</mn><mn>2</mn></munderover><munderover><mo lspace="0em" rspace="0em">gcd</mo><mn>1</mn><mn>2</mn></munderover><munder><mo lspace="0em" rspace="0em">inf</mo><mn>1</mn></munder><mover><mo lspace="0em" rspace="0em">lim</mo><mn>2</mn></mover><munderover><mo lspace="0em" rspace="0em">liminf</mo><mn>1</mn><mn>2</mn></munderover><munderover><mo lspace="0em" rspace="0em">limsup</mo><mn>1</mn><mn>2</mn></munderover><munder><mo lspace="0em" rspace="0em">max</mo><mn>1</mn></munder><mover><mo lspace="0em" rspace="0em">min</mo><mn>2</mn></mover><munderover><mo lspace="0em" rspace="0em">Pr</mo><mn>1</mn><mn>2</mn></munderover><munderover><mo lspace="0em" rspace="0em">sup</mo><mn>1</mn><mn>2</mn></munderover></mrow><annotation encoding="TeX">\\arccos_1 \\arcsin^2 \\arctan_1^2 \\arg^2_1 \\cos_1 \\cosh^2 \\cot_1^2 \\coth^2_1 \\csc_1 \\deg^2 \\dim_1^2  \\exp^2_1 \\hom_1 \\ker^2 \\lg_1^2 \\ln^2_1 \\log_1 \\sec^2 \\sin_1^2 \\sinh^2_1 \\tan_1 \\tanh^2 \\det_1^2 \\gcd^2_1 \\inf_1 \\lim^2 \\liminf_1^2 \\limsup^2_1 \\max_1 \\min^2 \\Pr_1^2 \\sup^2_1</annotation></semantics></math>'],