diff --git a/anki/collection.py b/anki/collection.py
index 700d8b05d..73fd1408c 100644
--- a/anki/collection.py
+++ b/anki/collection.py
@@ -490,6 +490,7 @@ where c.nid = n.id and c.id in %s group by nid""" % ids2str(cids)):
             else:
                 format = format.replace("{{cloze:", "{{ca:%d:" % (
                     data[4]+1))
+                fields['FrontSide'] = d['q']
             fields = runFilter("mungeFields", fields, model, data, self)
             html = anki.template.render(format, fields)
             d[type] = runFilter(
diff --git a/anki/stdmodels.py b/anki/stdmodels.py
index c8e8fecbf..6b4ac3327 100644
--- a/anki/stdmodels.py
+++ b/anki/stdmodels.py
@@ -19,7 +19,7 @@ def addBasicModel(col):
     mm.addField(m, fm)
     t = mm.newTemplate(_("Card 1"))
     t['qfmt'] = _("{{Front}}")
-    t['afmt'] = t['qfmt'] + "\n\n<hr id=answer>\n\n"+_("{{Back}}")
+    t['afmt'] = "{{FrontSide}}\n\n<hr id=answer>\n\n"+_("{{Back}}")
     mm.addTemplate(m, t)
     mm.add(m)
     return m