diff --git a/src/core/smallmap_type.hpp b/src/core/smallmap_type.hpp
index d7a9a38322..5eb94e23a2 100644
--- a/src/core/smallmap_type.hpp
+++ b/src/core/smallmap_type.hpp
@@ -79,12 +79,12 @@ struct SmallMap : std::vector<SmallPair<T, U> > {
 
 	inline const Pair *End() const
 	{
-		return &*std::vector<Pair>::end();
+		return std::vector<Pair>::data() + std::vector<Pair>::size();
 	}
 
 	inline Pair *End()
 	{
-		return &*std::vector<Pair>::end();
+		return std::vector<Pair>::data() + std::vector<Pair>::size();
 	}