diff --git a/Daemon.cpp b/Daemon.cpp
index 4991ab07..3fdc8a48 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -74,8 +74,8 @@ namespace i2p
 			int port = i2p::util::config::GetArg("-port", 0);
 			if (port)
 				i2p::context.UpdatePort (port);					
-			const char * host = i2p::util::config::GetCharArg("-host", "");
-			if (host && host[0])
+			std::string host = i2p::util::config::GetArg("-host", "");
+			if (host != "")
 				i2p::context.UpdateAddress (boost::asio::ip::address::from_string (host));	
 
 			i2p::context.SetSupportsV6 (i2p::util::config::GetArg("-v6", 0));
diff --git a/RouterContext.cpp b/RouterContext.cpp
index 4cdb9e63..31038820 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -46,8 +46,8 @@ namespace i2p
 		int port = i2p::util::config::GetArg("-port", 0);
 		if (!port)
 			port = rand () % (30777 - 9111) + 9111; // I2P network ports range
-		routerInfo.AddSSUAddress (i2p::util::config::GetCharArg("-host", "127.0.0.1"), port, routerInfo.GetIdentHash ());
-		routerInfo.AddNTCPAddress (i2p::util::config::GetCharArg("-host", "127.0.0.1"), port);
+		routerInfo.AddSSUAddress (i2p::util::config::GetArg("-host", "127.0.0.1").c_str (), port, routerInfo.GetIdentHash ());
+		routerInfo.AddNTCPAddress (i2p::util::config::GetArg("-host", "127.0.0.1").c_str (), port);
 		routerInfo.SetCaps (i2p::data::RouterInfo::eReachable | 
 			i2p::data::RouterInfo::eSSUTesting | i2p::data::RouterInfo::eSSUIntroducer); // LR, BC
 		routerInfo.SetProperty ("coreVersion", I2P_VERSION);
diff --git a/util.cpp b/util.cpp
index 20f376da..53762580 100644
--- a/util.cpp
+++ b/util.cpp
@@ -114,13 +114,6 @@ namespace config
 		}
 	}
 
-	const char* GetCharArg(const std::string& strArg, const std::string& nDefault)
-	{
-		if (mapArgs.count(strArg))
-			return mapArgs[strArg].c_str();
-		return nDefault.c_str();
-	}
-
 	std::string GetArg(const std::string& strArg, const std::string& strDefault)
 	{
 		if (mapArgs.count(strArg))