diff --git a/buffet/map_utils.h b/buffet/map_utils.h
index 87d8d37..f5e3f30 100644
--- a/buffet/map_utils.h
+++ b/buffet/map_utils.h
@@ -16,7 +16,7 @@
 std::vector<typename T::key_type> GetMapKeys(const T& map) {
   std::vector<typename T::key_type> keys;
   keys.reserve(map.size());
-  for (auto&& pair : map)
+  for (const auto& pair : map)
     keys.push_back(pair.first);
   return keys;
 }
@@ -26,7 +26,7 @@
 std::vector<typename T::mapped_type> GetMapValues(const T& map) {
   std::vector<typename T::mapped_type> values;
   values.reserve(map.size());
-  for (auto&& pair : map)
+  for (const auto& pair : map)
     values.push_back(pair.second);
   return values;
 }
@@ -37,7 +37,7 @@
                       typename T::mapped_type>> MapToVector(const T& map) {
   std::vector<std::pair<typename T::key_type, typename T::mapped_type>> vector;
   vector.reserve(map.size());
-  for (auto&& pair : map)
+  for (const auto& pair : map)
     vector.push_back(pair);
   return vector;
 }
