diff --git a/NetDb.cpp b/NetDb.cpp
index e1d49c5c..d0a75c3a 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -342,7 +342,7 @@ namespace data
 	{
 		std::unique_lock<std::mutex> lock(m_RouterInfosMutex);
 		for ( const auto & item : m_RouterInfos )
-			v(*item.second);
+			v(item.second);
 	}
 
 	size_t NetDb::VisitRandomRouterInfos(RouterInfoFilter filter, RouterInfoVisitor v, size_t n)
@@ -359,7 +359,7 @@ namespace data
 				if(i >= idx) // are we at the random start point?
 				{
 					// yes, check if we want this one
-					if(filter(*it.second))
+					if(filter(it.second))
 					{
 						// we have a match
 						--n;
@@ -383,7 +383,7 @@ namespace data
 		// visit the ones we found
 		size_t visited = 0;
 		for(const auto & ri : found ) {
-			v(*ri);
+			v(ri);
 			++visited;
 		}
 		return visited;
diff --git a/NetDb.h b/NetDb.h
index 294e1c83..d8ee148a 100644
--- a/NetDb.h
+++ b/NetDb.h
@@ -38,10 +38,10 @@ namespace data
 	typedef std::function<void(const IdentHash, std::shared_ptr<LeaseSet>)> LeaseSetVisitor;
 
 	/** function for visiting a router info we have locally */
-	typedef std::function<void(const i2p::data::RouterInfo &)> RouterInfoVisitor; 
+	typedef std::function<void(std::shared_ptr<const i2p::data::RouterInfo>)> RouterInfoVisitor; 
 
 	/** function for visiting a router info and determining if we want to use it */
-	typedef std::function<bool(const i2p::data::RouterInfo &)> RouterInfoFilter;
+	typedef std::function<bool(std::shared_ptr<const i2p::data::RouterInfo>)> RouterInfoFilter;
   
 	class NetDb
 	{