diff --git a/libluna/include/luna/HashTable.h b/libluna/include/luna/HashTable.h
index df97aa06..243be925 100644
--- a/libluna/include/luna/HashTable.h
+++ b/libluna/include/luna/HashTable.h
@@ -48,13 +48,14 @@ template <typename T> class HashTable
         usize i = index;
 
         do {
-            auto& bucket = m_buckets[index];
+            auto& bucket = m_buckets[i];
             if (bucket.has_value())
             {
                 if (*bucket == value) return bucket.value_ptr();
                 i++;
             }
-            return nullptr;
+            else
+                return nullptr;
         } while (i != index);
 
         return nullptr;
@@ -70,7 +71,7 @@ template <typename T> class HashTable
         usize i = index;
 
         do {
-            auto& bucket = m_buckets[index];
+            auto& bucket = m_buckets[i];
             if (bucket.has_value())
             {
                 if (*bucket == value)
@@ -82,7 +83,8 @@ template <typename T> class HashTable
                 }
                 i++;
             }
-            return false;
+            else
+                return false;
         } while (i != index);
 
         return false;