diff --git a/wst/trunk/ws_helper/generator.pas b/wst/trunk/ws_helper/generator.pas
index 210c575e1..1892dde18 100644
--- a/wst/trunk/ws_helper/generator.pas
+++ b/wst/trunk/ws_helper/generator.pas
@@ -1712,17 +1712,27 @@ var
   end;
 
   procedure GenerateRegistrationProc();
-  Var
-    strBuff : string;
+  var
+    strBuff, locClassName, locInterfName : string;
   Begin
     NewLine();
     BeginAutoIndent();
       strBuff := ExtractserviceName(AIntf);
+      locClassName := strClassName;
+      locInterfName := QuotedStr(AIntf.Name);
       NewLine();
       WriteLn('procedure Register%sImplementationFactory();',[strBuff]);
       WriteLn('Begin');
         IncIndent();
-          WriteLn('GetServiceImplementationRegistry().Register(%s,TImplementationFactory.Create(%s,wst_GetServiceConfigText(%s)) as IServiceImplementationFactory);',[QuotedStr(AIntf.Name),strClassName,QuotedStr(AIntf.Name)]);
+          strBuff := Format(
+            'GetServiceImplementationRegistry().Register(' +
+               '%s,' +
+               'TImplementationFactory.Create(' +
+                 '%s,wst_GetServiceConfigText(%s)' +
+               ') as IServiceImplementationFactory);',
+            [locInterfName,locClassName,locInterfName]
+          );
+          WriteLn(strBuff);
         DecIndent();
       WriteLn('End;');
     EndAutoIndent();