diff --git a/ChangeLog b/ChangeLog
index 52dd48fd..4045e1ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-15  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Code cleanup
+	* src/bittorrent_helper.cc
+
 2009-11-15  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Use C++ style cast
diff --git a/src/bittorrent_helper.cc b/src/bittorrent_helper.cc
index 8d0131a4..68ebb915 100644
--- a/src/bittorrent_helper.cc
+++ b/src/bittorrent_helper.cc
@@ -496,8 +496,7 @@ void loadFromMemory(const std::string& context,
 {
   processRootDictionary
     (ctx,
-     bencode::decode(reinterpret_cast<const unsigned char*>(context.c_str()),
-		     context.size()),
+     bencode::decode(context),
      defaultName, overrideName,
      std::deque<std::string>());
 }
@@ -510,8 +509,7 @@ void loadFromMemory(const std::string& context,
 {
   processRootDictionary
     (ctx,
-     bencode::decode(reinterpret_cast<const unsigned char*>(context.c_str()),
-		     context.size()),
+     bencode::decode(context),
      defaultName, overrideName,
      uris);
 }