diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 86ebd1f1cc..5f2a69f7ee 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-19 16:50 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * harbour/source/rtl/gtwvt/gtwvt.c
+    * Fixed not to generate RT if class is already been registered.
+      Useful in cases where multiple windows are implemented.
+
 2009-02-20 00:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + Added autodetection of compiler based on build data on linux.
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index 96f2ee3556..8fa69735fa 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -136,7 +136,13 @@ static void hb_gt_wvt_RegisterClass( HINSTANCE hInstance )
    wndclass.lpszClassName = s_szClassName;
 
    if( ! RegisterClass( &wndclass ) )
-      hb_errInternal( 10001, "Failed to register WVT window class", NULL, NULL );
+   {
+      int iError = GetLastError();
+      if( iError != 1410 )
+      {
+         hb_errInternal( 10001, "Failed to register WVT window class", NULL, NULL );
+      }
+   }
 }
 
 static PHB_GTWVT hb_gt_wvt_Find( HWND hWnd )