diff --git a/I2PTunnel.cpp b/I2PTunnel.cpp
index fc4da719..cca56120 100644
--- a/I2PTunnel.cpp
+++ b/I2PTunnel.cpp
@@ -54,13 +54,18 @@ namespace client
 #ifdef __linux__ 			
 			// bind to 127.x.x.x address 
 			// where x.x.x are first three bytes from ident
-			m_Socket->open (boost::asio::ip::tcp::v4 ());
-			boost::asio::ip::address_v4::bytes_type bytes;
-			const uint8_t * ident = m_Stream->GetRemoteIdentity ()->GetIdentHash ();
-			bytes[0] = 127;
-			memcpy (bytes.data ()+1, ident, 3);
-			boost::asio::ip::address ourIP = boost::asio::ip::address_v4 (bytes);
-			m_Socket->bind (boost::asio::ip::tcp::endpoint (ourIP, 0));
+
+			if (m_RemoteEndpoint.address ().is_v4 () &&
+				m_RemoteEndpoint.address ().to_v4 ().to_bytes ()[0] == 127)
+			{
+				m_Socket->open (boost::asio::ip::tcp::v4 ());
+				boost::asio::ip::address_v4::bytes_type bytes;
+				const uint8_t * ident = m_Stream->GetRemoteIdentity ()->GetIdentHash ();
+				bytes[0] = 127;
+				memcpy (bytes.data ()+1, ident, 3);
+				boost::asio::ip::address ourIP = boost::asio::ip::address_v4 (bytes);
+				m_Socket->bind (boost::asio::ip::tcp::endpoint (ourIP, 0));
+			}
 #endif
 			m_Socket->async_connect (m_RemoteEndpoint, std::bind (&I2PTunnelConnection::HandleConnect,
 				shared_from_this (), std::placeholders::_1));