diff --git a/SSU.cpp b/SSU.cpp
index 5bf9b63e..515e527a 100644
--- a/SSU.cpp
+++ b/SSU.cpp
@@ -485,7 +485,7 @@ namespace ssu
 			buf += 4; // address
 			uint16_t port = be16toh (*(uint16_t *)buf);
 			// send hole punch of 1 byte
-			m_Server.Send (buf, 1, boost::asio::ip::udp::endpoint (address, port));
+			m_Server.Send (buf, 0, boost::asio::ip::udp::endpoint (address, port));
 		}
 		else
 			LogPrint ("Address size ", size, " is not supported"); 	
@@ -1030,7 +1030,7 @@ namespace ssu
 					{
 						// connect through introducer
 						int numIntroducers = address->introducers.size ();
-						if (numIntroducers > 0 && !i2p::context.GetRouterInfo ().UsesIntroducer ())
+						if (numIntroducers > 0)
 						{
 							SSUSession * introducerSession = nullptr;
 							const i2p::data::RouterInfo::Introducer * introducer = nullptr;
@@ -1060,11 +1060,13 @@ namespace ssu
 							LogPrint ("Introduce new SSU session to [", router->GetIdentHashAbbreviation (), 
 									"] through introducer ", introducer->iHost, ":", introducer->iPort);
 							session->WaitForIntroduction ();	
+							if (i2p::context.GetRouterInfo ().UsesIntroducer ()) // if we are unreachable
+								Send (m_ReceiveBuffer, 0, remoteEndpoint); // send HolePunch
 							introducerSession->Introduce (introducer->iTag, introducer->iKey);
 						}
 						else
 						{	
-							LogPrint ("Can't connect to unreachable router. ", numIntroducers ? "We are unreachable" : "No introducers presented");
+							LogPrint ("Can't connect to unreachable router. No introducers presented");
 							m_Sessions.erase (remoteEndpoint);
 							delete session;
 							session = nullptr;
diff --git a/Tunnel.cpp b/Tunnel.cpp
index 4ffa700e..1dbcd8fc 100644
--- a/Tunnel.cpp
+++ b/Tunnel.cpp
@@ -400,19 +400,20 @@ namespace tunnel
 			std::unique_lock<std::mutex> l(m_OutboundTunnelsMutex);
 			for (auto it = m_OutboundTunnels.begin (); it != m_OutboundTunnels.end ();)
 			{
-				if (ts > (*it)->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
+				auto tunnel = *it;
+				if (ts > tunnel->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
 				{
-					LogPrint ("Tunnel ", (*it)->GetTunnelID (), " expired");
+					LogPrint ("Tunnel ", tunnel->GetTunnelID (), " expired");
 					auto pool = (*it)->GetTunnelPool ();
 					if (pool)
-						pool->TunnelExpired (*it);
+						pool->TunnelExpired (tunnel);
 					delete *it;
 					it = m_OutboundTunnels.erase (it);
 				}	
 				else 
 				{
-					if ((*it)->IsEstablished () && ts + TUNNEL_EXPIRATION_THRESHOLD > (*it)->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
-						(*it)->SetState (eTunnelStateExpiring);
+					if (tunnel->IsEstablished () && ts + TUNNEL_EXPIRATION_THRESHOLD > tunnel->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
+						tunnel->SetState (eTunnelStateExpiring);
 					it++;
 				}
 			}
@@ -440,19 +441,20 @@ namespace tunnel
 			std::unique_lock<std::mutex> l(m_InboundTunnelsMutex);
 			for (auto it = m_InboundTunnels.begin (); it != m_InboundTunnels.end ();)
 			{
-				if (ts > it->second->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
+				auto tunnel = it->second;
+				if (ts > tunnel->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
 				{
-					LogPrint ("Tunnel ", it->second->GetTunnelID (), " expired");
-					auto pool = it->second->GetTunnelPool ();
+					LogPrint ("Tunnel ", tunnel->GetTunnelID (), " expired");
+					auto pool = tunnel->GetTunnelPool ();
 					if (pool)
-						pool->TunnelExpired (it->second);
-					delete it->second;
+						pool->TunnelExpired (tunnel);
+					delete tunnel;
 					it = m_InboundTunnels.erase (it);
 				}	
 				else 
 				{
-					if (it->second->IsEstablished () && ts + TUNNEL_EXPIRATION_THRESHOLD > it->second->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
-						it->second->SetState (eTunnelStateExpiring);
+					if (tunnel->IsEstablished () && ts + TUNNEL_EXPIRATION_THRESHOLD > tunnel->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
+						tunnel->SetState (eTunnelStateExpiring);
 					it++;
 				}
 			}