diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
index ca452371..2d39f2b3 100644
--- a/Dllmain/BuildNo.rc
+++ b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7057 
+#define BUILD_NUMBER 7058 
diff --git a/dinput8/IDirectInputDevice8.cpp b/dinput8/IDirectInputDevice8.cpp
index 35d79d44..6d8e9147 100644
--- a/dinput8/IDirectInputDevice8.cpp
+++ b/dinput8/IDirectInputDevice8.cpp
@@ -138,6 +138,8 @@ HRESULT m_IDirectInputDevice8::FakeGetDeviceData(DWORD cbObjectData, LPDIDEVICEO
 		return DI_OK;
 	}
 
+	Lock();
+
 	// Get latest ouse state from the DirectInput8 buffer
 	{
 		std::vector<DIDEVICEOBJECTDATA> dod;
@@ -182,8 +184,6 @@ HRESULT m_IDirectInputDevice8::FakeGetDeviceData(DWORD cbObjectData, LPDIDEVICEO
 	GetSystemTimeAsFileTime((FILETIME*)&fTime);
 	fTime = fTime / 1000;
 
-	Lock();
-
 	// Checking for overflow
 	if (rgdod == nullptr && *pdwInOut == 0)
 	{