diff --git a/src/map.cpp b/src/map.cpp
index 51d0b9885..55eb4fbce 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -21,7 +21,7 @@ GB_STATIC_ASSERT(gb_size_of(u64) >= gb_size_of(void *));
 
 gb_inline HashKey hashing_proc(void const *data, isize len) {
 	HashKey h = {};
-	h.key = gb_fnv64a(data, len);
+	h.key = fnv64a(data, len);
 	return h;
 }
 
diff --git a/src/string_map.cpp b/src/string_map.cpp
index 1b8f6cf93..c8715b60b 100644
--- a/src/string_map.cpp
+++ b/src/string_map.cpp
@@ -10,16 +10,15 @@ struct StringHashKey {
 	String string;
 };
 
-StringHashKey string_hashing_proc(void const *data, isize len) {
-	StringHashKey h = {};
-	h.hash = gb_fnv64a(data, len);
-	h.string.text = (u8 *)data;
-	h.string.len = len;
-	return h;
+u64 string_hashing_proc(void const *data, isize len) {
+	return fnv64a(data, len);
 }
 
 gb_inline StringHashKey string_hash_string(String const &s) {
-	return string_hashing_proc(s.text, s.len);
+	StringHashKey hash_key = {};
+	hash_key.hash = string_hashing_proc(s.text, s.len);
+	hash_key.string = s;
+	return hash_key;
 }