diff --git a/harbour/source/common/hbffind.c b/harbour/source/common/hbffind.c
index c6639836a9..d83bff9a5b 100644
--- a/harbour/source/common/hbffind.c
+++ b/harbour/source/common/hbffind.c
@@ -564,7 +564,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
 
       if( info->hFindFile != INVALID_HANDLE_VALUE )
       {
-         if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->dwAttr & HB_FA_NORMAL ))
+         if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->pFindFileData.dwFileAttributes & HB_FA_NORMAL ))
          {
             bFound = TRUE;
          }
@@ -574,7 +574,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
   
             while( FindNextFile( info->hFindFile, &info->pFindFileData ) )
             {
-               if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->dwAttr & HB_FA_NORMAL ) )
+               if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->pFindFileData.dwFileAttributes & HB_FA_NORMAL ) )
                {
                   bFound = TRUE;
                   break;
@@ -669,7 +669,7 @@ BOOL hb_fsFindNext( PHB_FFIND ffind )
 
       while( FindNextFile( info->hFindFile, &info->pFindFileData ) )
       {
-         if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->dwAttr & HB_FA_NORMAL ))
+         if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->pFindFileData.dwFileAttributes & HB_FA_NORMAL ))
          {
             bFound = TRUE;
             break;