diff --git a/anki/media.py b/anki/media.py
index 2aaa2698c..f68501a1e 100644
--- a/anki/media.py
+++ b/anki/media.py
@@ -89,7 +89,6 @@ If the same name exists, compare checksums."""
         # convert latex first
         model = self.deck.models.get(mid)
         string = mungeQA(string, None, None, model, None, self.deck)
-        print string
         # extract filenames
         for reg in self.regexps:
             for (full, fname) in re.findall(reg, string):
@@ -161,10 +160,9 @@ If the same name exists, compare checksums."""
     def allMedia(self):
         "Return a set of all referenced filenames."
         files = set()
-        for p in self.deck.renderQA(type="all"):
-            for type in ("q", "a"):
-                for f in self.mediaFiles(p[type]):
-                    files.add(f)
+        for mid, flds in self.deck.db.execute("select mid, flds from facts"):
+            for f in self.files(mid, flds):
+                files.add(f)
         return files
 
     # Copying on import
diff --git a/tests/test_media.py b/tests/test_media.py
index d97f474a4..35683a411 100644
--- a/tests/test_media.py
+++ b/tests/test_media.py
@@ -21,14 +21,15 @@ def test_add():
 
 def test_strings():
     d = getEmptyDeck()
-    mf = d.media.mediaFiles
-    assert mf("aoeu") == []
-    assert mf("aoeu<img src='foo.jpg'>ao") == ["foo.jpg"]
-    assert mf("aoeu<img src=foo bar.jpg>ao") == ["foo bar.jpg"]
-    assert mf("aoeu<img src=\"foo.jpg\">ao") == ["foo.jpg"]
-    assert mf("aoeu<img src=\"foo.jpg\"><img class=yo src=fo>ao") == [
+    mf = d.media.files
+    mid = d.models.models.keys()[0]
+    assert mf(mid, "aoeu") == []
+    assert mf(mid, "aoeu<img src='foo.jpg'>ao") == ["foo.jpg"]
+    assert mf(mid, "aoeu<img src=foo bar.jpg>ao") == ["foo bar.jpg"]
+    assert mf(mid, "aoeu<img src=\"foo.jpg\">ao") == ["foo.jpg"]
+    assert mf(mid, "aoeu<img src=\"foo.jpg\"><img class=yo src=fo>ao") == [
             "foo.jpg", "fo"]
-    assert mf("aou[sound:foo.mp3]aou") == ["foo.mp3"]
+    assert mf(mid, "aou[sound:foo.mp3]aou") == ["foo.mp3"]
     sp = d.media.strip
     assert sp("aoeu") == "aoeu"
     assert sp("aoeu[sound:foo.mp3]aoeu") == "aoeuaoeu"