diff --git a/RouterContext.cpp b/RouterContext.cpp
index af88c84a..cb8eb355 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -76,49 +76,27 @@ namespace i2p
 
 	bool RouterContext::Load ()
 	{
-		std::string dataDir = i2p::util::filesystem::GetDataDir ().string ();
-#ifndef _WIN32
-		dataDir.append ("/");
-#else
-		dataDir.append ("\\");
-#endif
-		std::string router_keys = dataDir;
-		router_keys.append (ROUTER_KEYS);
-		std::string router_info = dataDir;
-		router_info.append (ROUTER_INFO);
-
-		std::ifstream fk (router_keys.c_str (), std::ifstream::binary | std::ofstream::in);
+		std::ifstream fk (i2p::util::filesystem::GetFullPath (ROUTER_KEYS).c_str (), std::ifstream::binary | std::ofstream::in);
 		if (!fk.is_open ())	return false;
 			
 		fk.read ((char *)&m_Keys, sizeof (m_Keys));
 		m_SigningPrivateKey.Initialize (i2p::crypto::dsap, i2p::crypto::dsaq, i2p::crypto::dsag, 
 			CryptoPP::Integer (m_Keys.signingPrivateKey, 20));
 
-		m_RouterInfo = i2p::data::RouterInfo (router_info.c_str ()); // TODO
+		m_RouterInfo = i2p::data::RouterInfo (i2p::util::filesystem::GetFullPath (ROUTER_INFO).c_str ()); // TODO
 		
 		return true;
 	}
 	
 	void RouterContext::Save (bool infoOnly)
 	{
-		std::string dataDir = i2p::util::filesystem::GetDataDir ().string ();
-#ifndef _WIN32
-		dataDir.append ("/");
-#else
-		dataDir.append ("\\");
-#endif
-		std::string router_keys = dataDir;
-		router_keys.append (ROUTER_KEYS);
-		std::string router_info = dataDir;
-		router_info.append (ROUTER_INFO);
-
 		if (!infoOnly)
 		{	
-			std::ofstream fk (router_keys.c_str (), std::ofstream::binary | std::ofstream::out);
+			std::ofstream fk (i2p::util::filesystem::GetFullPath (ROUTER_KEYS).c_str (), std::ofstream::binary | std::ofstream::out);
 			fk.write ((char *)&m_Keys, sizeof (m_Keys));
 		}
 		
-		std::ofstream fi (router_info.c_str (), std::ofstream::binary | std::ofstream::out);
+		std::ofstream fi (i2p::util::filesystem::GetFullPath (ROUTER_INFO).c_str (), std::ofstream::binary | std::ofstream::out);
 		fi.write ((char *)m_RouterInfo.GetBuffer (), m_RouterInfo.GetBufferLen ());
 	}	
 }