1 files changed, 5 insertions, 4 deletions
diff --git a/src/zenserver/cache/structuredcachestore.cpp b/src/zenserver/cache/structuredcachestore.cpp
index a95ae4ca2..2fd8e8be8 100644
--- a/src/zenserver/cache/structuredcachestore.cpp
+++ b/src/zenserver/cache/structuredcachestore.cpp
@@ -1691,10 +1691,11 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 				Index.reserve(EntryCount);
 				for (auto It : m_Index)
 				{
-					size_t EntryIndex = Payloads.size();
-					Payloads.push_back(m_Payloads[EntryIndex]);
-					AccessTimes.push_back(m_AccessTimes[EntryIndex]);
-					Index.insert({It.first, EntryIndex});
+					size_t OldEntryIndex = It.second;
+					size_t NewEntryIndex = Payloads.size();
+					Payloads.push_back(m_Payloads[OldEntryIndex]);
+					AccessTimes.push_back(m_AccessTimes[OldEntryIndex]);
+					Index.insert({It.first, NewEntryIndex});
 				}
 				m_Index.swap(Index);
 				m_Payloads.swap(Payloads);