diff --git a/rapids/models.py b/rapids/models.py
index f3258b79..ac434ab0 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -274,12 +274,14 @@ class Rapid(models.Model):
         return marked_answers
 
     def GetImages(self, feedback=False):
-        images = self.images.all()
+        qs = self.images.all()
 
         if not feedback:
-            images = [i for i in images if not i.feedback_image]
+            images = [i.image for i in qs if not i.feedback_image]
+        else:
+            images = [i.image for i in qs]
 
-        return [images]
+        return images
 
     #def GetNonFeedbackQuestionImages(self):
         #return self.GetImages()