diff --git a/app/models/query.rb b/app/models/query.rb
index f697a72..7130080 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -65,8 +65,17 @@ class QueryCustomFieldColumn < QueryColumn
   end
   
   def value(issue)
-    cv = issue.custom_values.detect {|v| v.custom_field_id == @cf.id}
-    cv && @cf.cast_value(cv.value)
+    value= nil
+    if @cf.allow_multi
+      cva = issue.custom_values.find_all {|v| v.custom_field_id == @cf.id}
+      if cva.length >0
+        value= cva.join(", ")
+      end
+    else
+      cv= (issue.custom_values.detect {|v| v.custom_field_id == @cf.id})
+      value= cv.value unless cv.nil?
+    end
+    value && @cf.cast_value(value)
   end
 end