diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
index 04d568a36..21319c149 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -131,9 +131,9 @@ struct SJoystickWin32Control
     void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
     {
         //Get the GUID of the joystuck
-        const GUID guid = lpddi->guidProduct;
+        const GUID guid = lpddi->guidInstance;
         JoystickInfo activeJoystick;
-        activeJoystick.m_use_xinput = isXInputDevice(&guid);
+        activeJoystick.m_use_xinput = isXInputDevice(&lpddi->guidProduct);
     
         activeJoystick.Index=ActiveJoysticks.size();
         activeJoystick.guid=guid;