diff --git a/DDrawCompat/DDraw/DirectDrawClipper.cpp b/DDrawCompat/DDraw/DirectDrawClipper.cpp
index 3394cfe..3b2865b 100644
--- a/DDrawCompat/DDraw/DirectDrawClipper.cpp
+++ b/DDrawCompat/DDraw/DirectDrawClipper.cpp
@@ -150,7 +150,8 @@ namespace DDraw
 			auto it = g_surfaceToClipperData.find(&surface);
 			if (it != g_surfaceToClipperData.end())
 			{
-				auto [prevClipper, prevClipperData] = *it->second;
+				auto prevClipper = it->second->first;
+				auto& prevClipperData = it->second->second;
 				if (prevClipper == clipper)
 				{
 					return;