diff --git a/Destination.h b/Destination.h
index e028d372..11934f80 100644
--- a/Destination.h
+++ b/Destination.h
@@ -44,10 +44,10 @@ namespace stream
 			const i2p::data::PrivateKeys& GetPrivateKeys () const { return m_Keys; };
 			const uint8_t * GetEncryptionPrivateKey () const { return m_EncryptionPrivateKey; };
 			const uint8_t * GetEncryptionPublicKey () const { return m_EncryptionPublicKey; };
-			void HandleI2NPMessage (const uint8_t * buf, size_t len);
 
 			// implements GarlicDestination
 			const i2p::data::LeaseSet * GetLeaseSet ();
+			void HandleI2NPMessage (const uint8_t * buf, size_t len);
 
 			// override GarlicDestination
 			void ProcessGarlicMessage (I2NPMessage * msg);
diff --git a/Garlic.h b/Garlic.h
index 8986b82b..cabb7d5d 100644
--- a/Garlic.h
+++ b/Garlic.h
@@ -97,9 +97,10 @@ namespace garlic
 			virtual void ProcessGarlicMessage (I2NPMessage * msg);
 			virtual void ProcessDeliveryStatusMessage (I2NPMessage * msg);			
 			virtual void SetLeaseSetUpdated ();
-
+			
 			virtual const i2p::data::LeaseSet * GetLeaseSet () = 0; // TODO
-
+			virtual void HandleI2NPMessage (const uint8_t * buf, size_t len) = 0;
+			
 		protected:
 
 			void HandleGarlicMessage (I2NPMessage * msg);
diff --git a/Identity.h b/Identity.h
index ea036921..4acae83c 100644
--- a/Identity.h
+++ b/Identity.h
@@ -242,7 +242,6 @@ namespace data
 			virtual const PrivateKeys& GetPrivateKeys () const = 0;
 			virtual const uint8_t * GetEncryptionPrivateKey () const = 0; 
 			virtual const uint8_t * GetEncryptionPublicKey () const = 0; 
-			virtual void HandleI2NPMessage (const uint8_t * buf, size_t len) = 0;
 
 			const IdentityEx& GetIdentity () const { return GetPrivateKeys ().GetPublic (); };
 			const IdentHash& GetIdentHash () const { return GetIdentity ().GetIdentHash (); };  
diff --git a/RouterContext.h b/RouterContext.h
index 0c39c0dd..ae3e3f10 100644
--- a/RouterContext.h
+++ b/RouterContext.h
@@ -41,10 +41,10 @@ namespace i2p
 			const uint8_t * GetEncryptionPrivateKey () const { return m_Keys.GetPrivateKey (); };
 			const uint8_t * GetEncryptionPublicKey () const { return GetIdentity ().GetStandardIdentity ().publicKey; };
 			void SetLeaseSetUpdated () {};
-			void HandleI2NPMessage (const uint8_t * buf, size_t len);
 
 			// implements GarlicDestination
 			const i2p::data::LeaseSet * GetLeaseSet () { return nullptr; };
+			void HandleI2NPMessage (const uint8_t * buf, size_t len);
 			
 		private: