diff --git a/ChangeLog b/ChangeLog
index ab8418d189..84a2bcf009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
-Thu Aug  8 08:29:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* lib/optparse.rb (OptionParser::Switch::parse_arg): require block
-	  always.
+Thu Aug  8 09:37:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* lib/optparse.rb (NilClass): must provide conversion block.
 
+	* lib/optparse.rb (String): ditto.
+
 Wed Aug  7 22:12:54 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* lib/optparse.rb (OptionParser::Completion::convert): returned
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 05d36e89d8..dc4564a4c5 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -210,7 +210,7 @@ Individual switch class.
 =end #'#"#`#
     def parse(arg, *val)
       if block
-	val = conv.yield(*val)
+	val = conv.yield(*val) if conv
 	return arg, block, val
       else
 	return arg, nil
@@ -1291,7 +1291,7 @@ Default options, which never appear in option summary.
 : String
   any none-empty string, and no conversion.
 =end #'#"#`#
-  accept(String, /.+/)
+  accept(String, /.+/) {|s,*|s}
 
 =begin
 : Integer