diff --git a/source/nanoFramework.System.Net/Properties/AssemblyInfo.cs b/source/nanoFramework.System.Net/Properties/AssemblyInfo.cs
index 6ff3f1f..a4fe938 100644
--- a/source/nanoFramework.System.Net/Properties/AssemblyInfo.cs
+++ b/source/nanoFramework.System.Net/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 
 ////////////////////////////////////////////////////////////////
 // update this whenever the native assembly signature changes //
-[assembly: AssemblyNativeVersion("1.0.6.0")]
+[assembly: AssemblyNativeVersion("1.0.7.0")]
 ////////////////////////////////////////////////////////////////
 
 // Setting ComVisible to false makes the types in this assembly not visible 
diff --git a/source/nanoFramework.System.Net/Sockets/Socket.cs b/source/nanoFramework.System.Net/Sockets/Socket.cs
index 2c2fbba..0968ebc 100644
--- a/source/nanoFramework.System.Net/Sockets/Socket.cs
+++ b/source/nanoFramework.System.Net/Sockets/Socket.cs
@@ -24,6 +24,7 @@ public class Socket : IDisposable
 
         private bool m_fBlocking = true;
         private EndPoint m_localEndPoint = null;
+        private EndPoint _remoteEndPoint = null;
 
         // timeout values are stored in uSecs since the Poll method requires it.
         private int m_recvTimeout = System.Threading.Timeout.Infinite;
@@ -313,6 +314,9 @@ public void Connect(EndPoint remoteEP)
                 throw new ObjectDisposedException();
             }
 
+            // store remote endpoint we are connecting to
+            _remoteEndPoint = remoteEP;
+
             NativeSocket.connect(this, remoteEP.Serialize().m_Buffer, !m_fBlocking);
 
             if (m_fBlocking)