diff --git a/Debugger.Core/Src/Variables/Types/DebugType-Helpers.cs b/Debugger.Core/Src/Variables/Types/DebugType-Helpers.cs
index 535bdf165..20ba364ff 100644
--- a/Debugger.Core/Src/Variables/Types/DebugType-Helpers.cs
+++ b/Debugger.Core/Src/Variables/Types/DebugType-Helpers.cs
@@ -61,8 +61,8 @@ namespace Debugger
 					case CorElementType.U8: return typeof(System.UInt64);
 					case CorElementType.R4: return typeof(System.Single);
 					case CorElementType.R8: return typeof(System.Double);
-					case CorElementType.I: return typeof(int);
-					case CorElementType.U: return System.Environment.Is64BitProcess?typeof(ulong):typeof(uint);
+					case CorElementType.I: return typeof(IntPtr);
+					case CorElementType.U: return typeof(UIntPtr);//return System.Environment.Is64BitProcess?typeof(ulong):typeof(uint);
 					case CorElementType.SZARRAY:
 					case CorElementType.ARRAY: return typeof(System.Array);
 					case CorElementType.OBJECT: return typeof(System.Object);
diff --git a/Libraries/Debugger.Core.dll b/Libraries/Debugger.Core.dll
index 1fc85fbb4..7a43a702b 100644
Binary files a/Libraries/Debugger.Core.dll and b/Libraries/Debugger.Core.dll differ