diff --git a/templates/question-alert.html b/templates/question-alert.html
index 93b8003..3b23230 100644
--- a/templates/question-alert.html
+++ b/templates/question-alert.html
@@ -7,6 +7,6 @@
     </h3>
 
     <div id="text">
-        {{ md(q['text'], q) }}
+        {{ md(q['text']) }}
     </div>
 </div>
diff --git a/templates/question-checkbox.html b/templates/question-checkbox.html
index d4a780a..88bd802 100644
--- a/templates/question-checkbox.html
+++ b/templates/question-checkbox.html
@@ -11,7 +11,7 @@
                     <input type="checkbox" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}">
                 </div>
                 <div class="p-2">
-                    <label for="{{n}}">{{ md(opt, q) }}</label>
+                    <label for="{{n}}">{{ md(opt) }}</label>
                 </div>
             </div>
         </a>
diff --git a/templates/question-information.html b/templates/question-information.html
index 92b5378..7543bf6 100644
--- a/templates/question-information.html
+++ b/templates/question-information.html
@@ -7,6 +7,6 @@
     </h3>
 
     <div id="text">
-        {{ md(q['text'], q) }}
+        {{ md(q['text']) }}
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/question-radio.html b/templates/question-radio.html
index c8bc4bb..d41f636 100644
--- a/templates/question-radio.html
+++ b/templates/question-radio.html
@@ -11,7 +11,7 @@
                     <input type="radio" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}">
                 </div>
                 <div class="p-1">
-                    <label for="{{n}}">{{ md(opt, q) }}</label>
+                    <label for="{{n}}">{{ md(opt) }}</label>
                 </div>
             </div>
         </a>
diff --git a/templates/question-success.html b/templates/question-success.html
index f4e897e..2842a74 100644
--- a/templates/question-success.html
+++ b/templates/question-success.html
@@ -7,6 +7,6 @@
     </h3>
 
     <div id="text">
-        {{ md(q['text'], q) }}
+        {{ md(q['text']) }}
     </div>
 </div>
diff --git a/templates/question-warning.html b/templates/question-warning.html
index efeabb8..6f06f5e 100644
--- a/templates/question-warning.html
+++ b/templates/question-warning.html
@@ -7,6 +7,6 @@
     </h3>
 
     <div id="text">
-        {{ md(q['text'], q) }}
+        {{ md(q['text']) }}
     </div>
 </div>
diff --git a/templates/question.html b/templates/question.html
index f202e3f..ba726ad 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -11,7 +11,7 @@
   </h5>
   <div class="card-body">
     <div id="text">
-      {{ md(q['text'], q) }}
+      {{ md(q['text']) }}
     </div>
 
     {% block answer %}{% end %}
diff --git a/templates/review-question-checkbox.html b/templates/review-question-checkbox.html
index 86c57e4..a48d898 100644
--- a/templates/review-question-checkbox.html
+++ b/templates/review-question-checkbox.html
@@ -12,7 +12,7 @@
                     <i class="fa fa-check-square-o" aria-hidden="true"></i>
                 </div>
                 <div class="p-2">
-                    {{ md(opt, q) }}
+                    {{ md(opt) }}
                 </div>
                 <div class="ml-auto p-2">
                     {% if q['correct'][n] > 0 %}
@@ -28,10 +28,10 @@
 
             {% else %}
                 <div class="p-2">
-                    <i class="fa fa-square-o" aria-hidden="true"></i> 
+                    <i class="fa fa-square-o" aria-hidden="true"></i>
                 </div>
                 <div class="p-2">
-                    {{ md(opt, q) }}
+                    {{ md(opt) }}
                 </div>
                 <div class="ml-auto p-2">
                     {% if q['correct'][n] > 0 %}
diff --git a/templates/review-question-radio.html b/templates/review-question-radio.html
index 1bad631..c75f0fa 100644
--- a/templates/review-question-radio.html
+++ b/templates/review-question-radio.html
@@ -12,13 +12,13 @@
                     <i class="fa fa-dot-circle-o" aria-hidden="true"></i>
                 </div>
                 <div class="p-2">
-                    {{ md(opt, q) }}
+                    {{ md(opt) }}
                 </div>
                 <div class="ml-auto p-2">
                     {% if q['correct'][n] > 0 %}
                         <div class="text-right text-success">
                             <i class="fa fa-check" aria-hidden="true"></i>
-                        </div> 
+                        </div>
                     {% else %}
                         <div class="text-right text-danger">
                             <i class="fa fa-close" aria-hidden="true"></i>
@@ -31,7 +31,7 @@
                     <i class="fa fa-circle-o" aria-hidden="true"></i>
                 </div>
                 <div class="p-2">
-                    {{ md(opt, q) }}
+                    {{ md(opt) }}
                 </div>
                 <div class="ml-auto p-2">
                     {% if q['correct'][n] > 0 %}
diff --git a/tools.py b/tools.py
index e3f06db..7d63250 100644
--- a/tools.py
+++ b/tools.py
@@ -126,7 +126,7 @@ class HighlightRenderer(mistune.Renderer):
 
 markdown = MarkdownWithMath(HighlightRenderer(escape=True)) # hard_wrap=True to insert <br> on newline
 
-def md_to_html(text, q=None):
+def md_to_html(text):
     return markdown(text)
 
 # ---------------------------------------------------------------------------
--
libgit2 0.21.2