Make a stab at fixing MathUTett

The fix will require some harder debugging.