diff --git a/Garlic.cpp b/Garlic.cpp
index e86374f6..6d8efd7e 100644
--- a/Garlic.cpp
+++ b/Garlic.cpp
@@ -418,7 +418,7 @@ namespace garlic
 			{
 				case eGarlicDeliveryTypeLocal:
 					LogPrint ("Garlic type local");
-					i2p::HandleI2NPMessage (CreateI2NPMessage (buf, len));
+					i2p::HandleI2NPMessage (CreateI2NPMessage (buf, GetI2NPMessageLength (buf)));
 				break;	
 				case eGarlicDeliveryTypeDestination:
 				{	
@@ -445,7 +445,7 @@ namespace garlic
 					auto tunnel = i2p::tunnel::tunnels.GetNextOutboundTunnel ();
 					if (tunnel) // we have send it through an outbound tunnel
 					{	
-						I2NPMessage * msg = CreateI2NPMessage (buf, len - 36);
+						I2NPMessage * msg = CreateI2NPMessage (buf, GetI2NPMessageLength (buf));
 						tunnel->SendTunnelDataMsg (gwHash, gwTunnel, msg);
 					}	
 					else