diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb
index 7db25742..26c14bf6 100644
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -18,9 +18,8 @@ module Linguist
       data = blob.data
 
       @heuristics.each do |heuristic|
-        if heuristic.matches?(languages)
-          language = heuristic.call(data)
-          return [language] if language
+        if heuristic.matches?(languages) && result = heuristic.call(data)
+          return Array(result)
         end
       end