diff --git a/lib/searchkick/results.rb b/lib/searchkick/results.rb
index 667d5c0..875c407 100644
--- a/lib/searchkick/results.rb
+++ b/lib/searchkick/results.rb
@@ -45,8 +45,8 @@ module Searchkick
 
             if hit["highlight"]
               highlight = Hash[hit["highlight"].map { |k, v| [k.sub(/\.(analyzed|word_start|word_middle|word_end|text_start|text_middle|text_end)\z/, ""), v.first] }]
-              highlight.each do |k, v|
-                result["highlighted_#{k}"] ||= (v || result[k])
+              result.keys.each do |k|
+                result["highlighted_#{k}"] ||= (highlight[k] || result[k])
               end
             end
 
--
libgit2 0.21.0