diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a11362b5ef..707fe359ae 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-10-04 02:54 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/compiler/hbmain.c
+    ! fixed setting HB_FS_FIRST flag
+
 2007-10-03 17:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   + harbour/tests/oleenum.prg
     + added Enrico example and test code for enumerators and OLE objects
diff --git a/harbour/source/compiler/hbmain.c b/harbour/source/compiler/hbmain.c
index f745d20345..462d1a6b14 100644
--- a/harbour/source/compiler/hbmain.c
+++ b/harbour/source/compiler/hbmain.c
@@ -4493,17 +4493,10 @@ static int hb_compCompile( HB_COMP_DECL, const char * szPrg, int iFileType )
 
             if( szFirstFunction )
             {
-               PCOMSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst;
-
-               while( pSym )
-               {
-                  if( strcmp( pSym->szName, szFirstFunction ) == 0 )
-                  {
-                     pSym->cScope |= HB_FS_FIRST;
-                     break;
-                  }
-                  pSym = pSym->pNext;
-               }
+               PCOMSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, szFirstFunction,
+                                                    NULL, HB_SYM_FUNCNAME );
+               if( pSym )
+                  pSym->cScope |= HB_FS_FIRST;
             }
 
             if( ! HB_COMP_PARAM->fQuiet )