diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d6b834e87b..7162398cf6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -15,6 +15,11 @@
    under different terms, please contact respective author(s).
    The license applies to all entries newer than 2009-04-28.
 */
+
+2012-10-23 10:42 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbfbird/firebird.c
+    % further simplifications and fixed typo in prev
+
 2012-10-23 10:37 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbfbird/firebird.c
     ! fixed missing formatting/indenting in prev commit
diff --git a/harbour/contrib/hbfbird/firebird.c b/harbour/contrib/hbfbird/firebird.c
index 8c326e0449..cc3d3c1f80 100644
--- a/harbour/contrib/hbfbird/firebird.c
+++ b/harbour/contrib/hbfbird/firebird.c
@@ -477,16 +477,15 @@ HB_FUNC( FBFETCH )
       XSQLDA *         sqlda = ( XSQLDA * ) hb_itemGetPtr( hb_itemArrayGet( aParam, 2 ) );
       ISC_STATUS_ARRAY status;
       unsigned short   dialect = ( unsigned short ) hb_itemGetNI( hb_itemArrayGet( aParam, 5 ) );
-      ISC_STATUS       fetch_stat;
 
       /* TOFIX */
-      fetch_stat = isc_dsql_fetch( status, &stmt, dialect, sqlda );
-
-      hb_retnl( fetch_stat == 100L ? isc_sqlcode( status ) : -1 );
-      return;
+      hb_retnl( isc_dsql_fetch( status,
+                                &stmt,
+                                dialect,
+                                sqlda ) == 100L ? -1 : isc_sqlcode( status ) );
    }
-
-   hb_retnl( 0 );
+   else
+      hb_retnl( 0 );
 }
 
 HB_FUNC( FBFREE )