diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 848c6bb4a0..603f725d72 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-13 11:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/xhb/txml.prg
+    ! fixed wrongly defined scopes. Note: during porting xHarbour code
+      to Harbour scopes should be carefully checked because in xHarbour
+      in many cases wrong scopes does not cause any RT errors.
+
 2008-05-13 09:43 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    + contrib/hbct/tests/bld_b32.bat
    + contrib/hbct/tests/bld_vc.bat
diff --git a/harbour/contrib/xhb/txml.prg b/harbour/contrib/xhb/txml.prg
index 875bc604e2..cfdd1edef8 100644
--- a/harbour/contrib/xhb/txml.prg
+++ b/harbour/contrib/xhb/txml.prg
@@ -169,18 +169,20 @@ CLASS TXmlIterator
    METHOD SetContext()
    METHOD Clone()
 
-HIDDEN:
+PROTECTED:
+   METHOD MatchCriteria()
+
    DATA cName
    DATA cAttribute
    DATA cValue
    DATA cData
 
+HIDDEN:
    DATA nTopLevel
 
    DATA oNode
    DATA oTop
 
-   METHOD MatchCriteria()
 ENDCLASS
 
 
@@ -244,7 +246,7 @@ METHOD Next() CLASS TXmlIterator
 RETURN NIL
 
 METHOD MatchCriteria( oNode ) CLASS TXmlIterator
-HB_SYMBOL_UNUSED( oNode )
+   HB_SYMBOL_UNUSED( oNode )
 RETURN .T.
 
 
@@ -254,7 +256,7 @@ RETURN .T.
 
 CLASS TXmlIteratorScan FROM TXmlIterator
    METHOD New( oNodeTop ) CONSTRUCTOR
-HIDDEN:
+PROTECTED:
    METHOD MatchCriteria( oFound )
 ENDCLASS
 
@@ -273,7 +275,7 @@ METHOD MatchCriteria( oFound ) CLASS TXmlIteratorScan
    ENDIF
 
    IF ::cValue != NIL .and. ;
-         hb_HScan( oFound:aAttributes, {| xKey, cValue| HB_SYMBOL_UNUSED( xKey ), ::cValue == cValue}) == 0
+      hb_HScan( oFound:aAttributes, {| xKey, cValue| HB_SYMBOL_UNUSED( xKey ), ::cValue == cValue}) == 0
       RETURN .F.
    ENDIF
 
@@ -289,7 +291,7 @@ RETURN .T.
 
 CLASS TXmlIteratorRegex FROM TXmlIterator
    METHOD New( oNodeTop ) CONSTRUCTOR
-HIDDEN:
+PROTECTED:
    METHOD MatchCriteria( oFound )
 ENDCLASS