diff --git a/harbour/include/hbset.h b/harbour/include/hbset.h
index 65f8bf9bae..caa42636b0 100644
--- a/harbour/include/hbset.h
+++ b/harbour/include/hbset.h
@@ -140,7 +140,7 @@ typedef struct
    BOOL    HB_SET_ALTERNATE;
    char *  HB_SET_ALTFILE;
    BOOL    HB_SET_AUTOPEN;
-   BOOL    HB_SET_AUTORDER;
+   int     HB_SET_AUTORDER;
    int     HB_SET_AUTOSHARE;
    BOOL    HB_SET_BELL;
    BOOL    HB_SET_CANCEL;
diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c
index be2c31a1b2..5df8de1c7f 100644
--- a/harbour/source/rtl/set.c
+++ b/harbour/source/rtl/set.c
@@ -426,8 +426,14 @@ HB_FUNC( SET )
          if( args > 1 ) hb_set.HB_SET_AUTOPEN = set_logical( pArg2 );
          break;
       case HB_SET_AUTORDER   :
-         hb_retl( hb_set.HB_SET_AUTORDER );
-         if( args > 1 ) hb_set.HB_SET_AUTORDER = set_logical( pArg2 );
+         hb_retni( hb_set.HB_SET_AUTORDER );
+         if( args > 1 )
+         {
+            if( set_number( pArg2, hb_set.HB_SET_AUTORDER ) < 0 )
+               hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", 2, hb_paramError( 1 ), hb_paramError( 2 ) );
+            else
+               hb_set.HB_SET_AUTORDER = set_number( pArg2, hb_set.HB_SET_AUTORDER );
+         }
          break;
       case HB_SET_AUTOSHARE  :
          hb_retni( hb_set.HB_SET_AUTOSHARE );
@@ -751,7 +757,7 @@ void hb_setInitialize( void )
    hb_set.HB_SET_ALTFILE = NULL;
    hb_set.hb_set_althan = FS_ERROR;
    hb_set.HB_SET_AUTOPEN = TRUE;
-   hb_set.HB_SET_AUTORDER = FALSE;
+   hb_set.HB_SET_AUTORDER = 0;
    hb_set.HB_SET_AUTOSHARE = 0;
    hb_set.HB_SET_BELL = FALSE;
    hb_set.HB_SET_CANCEL = TRUE;