diff --git a/src/common/heap_array.h b/src/common/heap_array.h
index 2db424fa3..2a2cbc397 100644
--- a/src/common/heap_array.h
+++ b/src/common/heap_array.h
@@ -247,7 +247,11 @@ public:
 
   void fill(const_reference value) { std::fill(begin(), end(), value); }
 
-  void swap(this_type& move) { std::swap(m_data, move.m_data); }
+  void swap(this_type& rhs)
+  {
+    std::swap(m_data, rhs.m_data);
+    std::swap(m_size, rhs.m_size);
+  }
 
   void resize(size_t new_size) { internal_resize(new_size, m_data, m_size); }