diff --git a/ChangeLog b/ChangeLog
index 306aee48..ed781ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-20  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Code cleanup
+	* src/XmlRpcMethod.cc
+
 2009-12-20  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Documented about followedBy and belongsTo in man page.
diff --git a/src/XmlRpcMethod.cc b/src/XmlRpcMethod.cc
index 68ac442c..16e9909f 100644
--- a/src/XmlRpcMethod.cc
+++ b/src/XmlRpcMethod.cc
@@ -84,7 +84,7 @@ static void gatherOption
 {
   for(; first != last; ++first) {
     const std::string& optionName = (*first).first;
-    if(changeableOptions.find(optionName) == changeableOptions.end()) {
+    if(changeableOptions.count(optionName) == 0) {
       throw DL_ABORT_EX
 	(StringFormat
 	 ("%s cannot be changed or unknown option.", optionName.c_str()).str());