diff --git a/External/dinputto8 b/External/dinputto8
index 0abb7eb9..d1fff9c2 160000
--- a/External/dinputto8
+++ b/External/dinputto8
@@ -1 +1 @@
-Subproject commit 0abb7eb945980df170c330013c872d8c9f869231
+Subproject commit d1fff9c21f7642c51172835c9b6cedcbbc088f87
diff --git a/dinput8/IDirectInputDevice8.cpp b/dinput8/IDirectInputDevice8.cpp
index 09f5c696..d68c1896 100644
--- a/dinput8/IDirectInputDevice8.cpp
+++ b/dinput8/IDirectInputDevice8.cpp
@@ -89,7 +89,7 @@ HRESULT m_IDirectInputDevice8::SetProperty(REFGUID rguidProp, LPCDIPROPHEADER pd
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
 	// Handle mouse input
-	if (Config.FixHighFrequencyMouse && IsMouse)
+	if (IsMouse && Config.FixHighFrequencyMouse)
 	{
 		const DWORD dwMinBufferSize = 128;
 
@@ -135,7 +135,7 @@ HRESULT m_IDirectInputDevice8::GetDeviceState(DWORD cbData, LPVOID lpvData)
 	return ProxyInterface->GetDeviceState(cbData, lpvData);
 }
 
-HRESULT m_IDirectInputDevice8::FakeGetDeviceData(DWORD cbObjectData, LPDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD dwFlags)
+HRESULT m_IDirectInputDevice8::GetMouseDeviceData(DWORD cbObjectData, LPDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD dwFlags)
 {
 	// Check arguments
 	if (!pdwInOut || (rgdod && cbObjectData != sizeof(DIDEVICEOBJECTDATA) && cbObjectData != sizeof(DIDEVICEOBJECTDATA_DX3)))
@@ -316,9 +316,9 @@ HRESULT m_IDirectInputDevice8::GetDeviceData(DWORD cbObjectData, LPDIDEVICEOBJEC
 		}
 	}
 
-	if (Config.FixHighFrequencyMouse && IsMouse)
+	if (IsMouse && Config.FixHighFrequencyMouse)
 	{
-		return FakeGetDeviceData(cbObjectData, rgdod, pdwInOut, dwFlags);
+		return GetMouseDeviceData(cbObjectData, rgdod, pdwInOut, dwFlags);
 	}
 
 	return ProxyInterface->GetDeviceData(cbObjectData, rgdod, pdwInOut, dwFlags);
diff --git a/dinput8/IDirectInputDevice8.h b/dinput8/IDirectInputDevice8.h
index 8d641cdc..090d51e1 100644
--- a/dinput8/IDirectInputDevice8.h
+++ b/dinput8/IDirectInputDevice8.h
@@ -110,7 +110,7 @@ class m_IDirectInputDevice8 : public IDirectInputDevice8A, public IDirectInputDe
 	STDMETHOD(Acquire)(THIS);
 	STDMETHOD(Unacquire)(THIS);
 	STDMETHOD(GetDeviceState)(THIS_ DWORD, LPVOID);
-	STDMETHOD(FakeGetDeviceData)(THIS_ DWORD, LPDIDEVICEOBJECTDATA, LPDWORD, DWORD);
+	STDMETHOD(GetMouseDeviceData)(THIS_ DWORD, LPDIDEVICEOBJECTDATA, LPDWORD, DWORD);
 	STDMETHOD(GetDeviceData)(THIS_ DWORD, LPDIDEVICEOBJECTDATA, LPDWORD, DWORD);
 	STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT);
 	STDMETHOD(SetEventNotification)(THIS_ HANDLE);