diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 12e53bb48d..69d1c9837a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-21 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbxbp/xbp.ch
+    ! Restored non-debug behavior due to other problems.
+      Now it won't work in codeblock though.
+
+  * contrib/hbxbp/tests/demoxbp.prg
+    ! Deleted debug calls from codeblocks in the meantime.
+
 2009-06-21 10:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbxbp/xbp.ch
     ! Fixed for non-debug. Currently it's suboptimal as non-debug
diff --git a/harbour/contrib/hbxbp/tests/demoxbp.prg b/harbour/contrib/hbxbp/tests/demoxbp.prg
index 0892847d30..452d1479d9 100644
--- a/harbour/contrib/hbxbp/tests/demoxbp.prg
+++ b/harbour/contrib/hbxbp/tests/demoxbp.prg
@@ -613,13 +613,13 @@ STATIC FUNCTION Build_ComboBox( oWnd )
    // Code block for selection:
    //  - assign to LOCAL variable using :getData()
    //  - display LOCAL variable using DispoutAt()
-   bAction := {|mp1, mp2, obj| obj:XbpSLE:getData(), hb_outDebug( 'Highlighted: '+cDay ) }
+   bAction := {|mp1, mp2, obj| obj:XbpSLE:getData() }
 
    // Assign code block for selection with Up and Down keys
    oCombo:ItemMarked := bAction
 
    // Assign code block for selection by left mouse click in list box
-   oCombo:ItemSelected := {|mp1, mp2, obj| obj:XbpSLE:getData(), hb_outDebug( 'Selected: '+cDay ) }
+   oCombo:ItemSelected := {|mp1, mp2, obj| obj:XbpSLE:getData() }
 
    // Copy data from array to combo box, then discard array
    FOR i := 1 TO 7
diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch
index 7cc3e06760..588b13375c 100644
--- a/harbour/contrib/hbxbp/xbp.ch
+++ b/harbour/contrib/hbxbp/xbp.ch
@@ -12,7 +12,7 @@
    #endif
 #else
    /* TOFIX: To generate NOOP code. */
-   #xtranslate HB_OUTDEBUG( [<x>] ) => ( Do( NIL ) )
+   #xtranslate HB_OUTDEBUG( [<x>] ) =>
 #endif
 
 /*----------------------------------------------------------------------*/