diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d8502d8b99..a719d1b887 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-17 00:25 UTC+1 JFL (mafact) <jfl@mafact.com>
+   * harbour/include/hbclass.ch
+    ! Change NO_OO_ERR to HB_CLS_NO_OO_ERR
+      Changed one Xtranslate in case of HB_CLS_NO_OO_ERR defined
+      to allow multiples classes not ordered. 
+
 2001-07-16 22:55 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
   * source/pp/ppcore.c
     ! minor fix, related to using of __PreProcess() function
diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index 2a0e22df4c..6fae24de4f 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -571,12 +571,17 @@ DECLARE TClass ;
 #ifndef HB_SHORTNAMES
 
 #xcommand METHOD <MethodName>                   => METHOD <MethodName>                       _CLASS_MODE_
-#xcommand METHOD <MethodName> CLASS <ClassName> => METHOD <MethodName> DECLCLASS <ClassName> _CLASS_IMPLEMENTATION_
 
-#ifdef NO_OO_ERR
+#ifdef HB_CLS_NO_OO_ERR
+
+   #xcommand METHOD <MethodName> CLASS <ClassName> => METHOD <MethodName>     CLASS <ClassName> _CLASS_IMPLEMENTATION_
+
    #xcommand METHOD <MethodName>                      _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>
    #xcommand METHOD <MethodName> CLASS <ClassName>    _CLASS_IMPLEMENTATION_ => DECLARED METHOD <ClassName> <MethodName>
 #else
+
+   #xcommand METHOD <MethodName> CLASS <ClassName> => METHOD <MethodName> DECLCLASS <ClassName> _CLASS_IMPLEMENTATION_
+
    //#define STRICT_OO
    #ifdef STRICT_OO
       #xcommand METHOD <MethodName>                   _CLASS_IMPLEMENTATION_ => __ERR(Method <"MethodName"> not declared or declaration mismatch in class: _CLASS_NAME_) ; function <MethodName> ; local self := QSelf()