diff --git a/Containers/public/Map.hpp b/Containers/public/Map.hpp
index a5c3fb7..642a6d9 100644
--- a/Containers/public/Map.hpp
+++ b/Containers/public/Map.hpp
@@ -336,7 +336,7 @@ namespace tp {
 
 			void operator++() {
 				mSlot++;
-				while ((map->isDeletedNode(map->mTable[mSlot]) || !map->mTable[mSlot]) && (mSlot != map->mNSlots)) {
+				while ((map->isDeletedNode(map->mTable[mSlot]) || !map->mTable[mSlot]) && (mSlot != (map->mNSlots - 1))) {
 					mSlot++;
 				}
 				if (mSlot != map->mNSlots) {