diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5d4245f09e..bc1ed3a7d7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2006-08-07 14:00 UTC+0100 Ryszard Glab <rglab//imid.med.pl>
+   * source/compiler/harbour.y
+      * fixed to support @funname() syntax in assigments
+      
+   * utils/hbpptest/pp_test.prg
+      * fixed preprocessor example
+   
+   * TODO
+      * removed 'to fix' vertical spacing in ppo files
+
+
 2006-08-07 12:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * xharbour/include/usrrdd.ch
    ! fixed RDD method order
diff --git a/harbour/TODO b/harbour/TODO
index 2b525156c5..f279915292 100644
--- a/harbour/TODO
+++ b/harbour/TODO
@@ -190,13 +190,6 @@ Status...: Open.
 
 ***
 
-Assign to: Ryszard
-Detail...: Clean vertical spacing in .ppo files. It's necessary to
-           strep leading blank lines from included files.
-Status...: Worjing on it.
-
-***
-
 Assign to: Przemek
 Detail...: Fix setting private base for code blocks created by macro
            compiler. Maybe it should be bound with making CLEAR MEMORY
diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y
index d38777d128..9f8783782d 100644
--- a/harbour/source/compiler/harbour.y
+++ b/harbour/source/compiler/harbour.y
@@ -824,7 +824,7 @@ Expression : Variable         { $$ = $1; }
            | Variable         { hb_comp_cVarType = ' ';} StrongType { $$ = $1; }
            | PareExpList      { hb_comp_cVarType = ' ';} StrongType { $$ = $1; }
            | '@' IdentName    { $$ = hb_compCheckPassByRef( hb_compExprNewVarRef( $2 ) ); }
-           | '@' FunIdentCall { $<string>$ = hb_compExprAsSymbol( $2 ); hb_compExprDelete( $2 ); $$ = hb_compCheckPassByRef( hb_compExprNewFunRef( $<string>$ ) ); }
+           | '@' FunIdentCall { int bPassByRef=hb_comp_bPassByRef;hb_comp_bPassByRef=HB_PASSBYREF_FUNCALL;$<string>$ = hb_compExprAsSymbol( $2 ); hb_compExprDelete( $2 ); $$ = hb_compCheckPassByRef( hb_compExprNewFunRef( $<string>$ ) ); hb_comp_bPassByRef=bPassByRef; }
            | '@' MacroVar     { $$ = hb_compCheckPassByRef( hb_compExprNewRef( $2 ) ); }
            | '@' AliasVar     { $$ = hb_compCheckPassByRef( hb_compExprNewRef( $2 ) ); }
            ;
diff --git a/harbour/utils/hbpptest/pp_test.prg b/harbour/utils/hbpptest/pp_test.prg
index 46ca643e73..12422d660e 100644
--- a/harbour/utils/hbpptest/pp_test.prg
+++ b/harbour/utils/hbpptest/pp_test.prg
@@ -499,7 +499,7 @@ DEFINE CLIPBOARD oC OF oD FORMAT TEXT
 	DECLARE WINDOW <w>  ; _DW( <"w">, <{IProc}> )
 
    DEFINE WINDOW &oW
-   DEFINE WINDOW &oW ON INIT oW.Title:= "My title"
+   DEFINE WINDOW &oW ON INIT &oW.Title:= "My title"
    &oW.Title := "title"
    &oW.f9 := 9