diff --git a/Util/src/HelpFormatter.cpp b/Util/src/HelpFormatter.cpp
index cb2627179..b98f14837 100644
--- a/Util/src/HelpFormatter.cpp
+++ b/Util/src/HelpFormatter.cpp
@@ -1,7 +1,7 @@
 //
 // HelpFormatter.cpp
 //
-// $Id: //poco/Main/Util/src/HelpFormatter.cpp#7 $
+// $Id: //poco/1.3/Util/src/HelpFormatter.cpp#2 $
 //
 // Library: Util
 // Package: Options
@@ -50,12 +50,13 @@ const int HelpFormatter::LINE_WIDTH = 78;
 HelpFormatter::HelpFormatter(const OptionSet& options): 
 	_options(options),
 	_width(LINE_WIDTH),
-	_indent(calcIndent()),
+	_indent(0),
 	_unixStyle(true)
 {
 #if !defined(POCO_OS_FAMILY_UNIX)
 	_unixStyle = false;
 #endif
+	_indent = calcIndent();
 }
 
 
diff --git a/Util/testsuite/src/HelpFormatterTest.cpp b/Util/testsuite/src/HelpFormatterTest.cpp
index 80d91e0b8..9c0830e95 100644
--- a/Util/testsuite/src/HelpFormatterTest.cpp
+++ b/Util/testsuite/src/HelpFormatterTest.cpp
@@ -1,7 +1,7 @@
 //
 // HelpFormatterTest.cpp
 //
-// $Id: //poco/Main/Util/testsuite/src/HelpFormatterTest.cpp#5 $
+// $Id: //poco/1.3/Util/testsuite/src/HelpFormatterTest.cpp#2 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -64,7 +64,7 @@ void HelpFormatterTest::testHelpFormatter()
 			.argument("path"));
 			
 	set.addOption(
-		Option("library-dir", "L", "specify a search path for locating library files")
+		Option("library-dir", "L", "specify a search path for locating library files (this option has a very long description)")
 			.required(false)
 			.repeatable(true)
 			.argument("path"));