diff --git a/Destination.cpp b/Destination.cpp
index 634e59f6..7a789700 100644
--- a/Destination.cpp
+++ b/Destination.cpp
@@ -527,20 +527,26 @@ namespace client
 		{
 			auto request = std::make_shared<LeaseSetRequest> (m_Service);
 			request->requestComplete.push_back (requestComplete);
+			auto ts = i2p::util::GetSecondsSinceEpoch ();
 			auto ret = m_LeaseSetRequests.insert (std::pair<i2p::data::IdentHash, std::shared_ptr<LeaseSetRequest> >(dest,request));
 			if (ret.second) // inserted
 			{
+				request->requestTime = ts;
 				if (!SendLeaseSetRequest (dest, floodfill, request))
 				{
 					// request failed
-					m_LeaseSetRequests.erase (dest);
+					m_LeaseSetRequests.erase (ret.first);
 					requestComplete (nullptr);
 				}
 			}	
 			else // duplicate
 			{
 				LogPrint (eLogInfo, "Destination: Request of LeaseSet ", dest.ToBase64 (), " is pending already");
-				ret.first->second->requestComplete.push_back (requestComplete);
+				// TODO: implement it properly
+				//ret.first->second->requestComplete.push_back (requestComplete);
+				if (ts > ret.first->second->requestTime + MAX_LEASESET_REQUEST_TIMEOUT)
+					m_LeaseSetRequests.erase (ret.first);
+				requestComplete (nullptr);
 			}	
 		}	
 		else
@@ -563,7 +569,6 @@ namespace client
 		if (request->replyTunnel && request->outboundTunnel)
 		{	
 			request->excluded.insert (nextFloodfill->GetIdentHash ());
-			request->requestTime = i2p::util::GetSecondsSinceEpoch ();
 			request->requestTimeoutTimer.cancel ();
 
 			uint8_t replyKey[32], replyTag[32];
diff --git a/Garlic.cpp b/Garlic.cpp
index 290b9b79..94ca82eb 100644
--- a/Garlic.cpp
+++ b/Garlic.cpp
@@ -274,7 +274,7 @@ namespace garlic
 					if (newTags) // new tags created
 					{
 						newTags->msgID = msgID;
-						m_UnconfirmedTagsMsgs.emplace (msgID, std::unique_ptr<UnconfirmedTags>(newTags));
+						m_UnconfirmedTagsMsgs.insert (std::make_pair(msgID, std::unique_ptr<UnconfirmedTags>(newTags)));
 						newTags = nullptr; // got acquired
 					}	
 					m_Owner->DeliveryStatusSent (shared_from_this (), msgID);