diff --git a/ChangeLog.txt b/ChangeLog.txt
index 44556341ed..2235a89135 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,10 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2025-01-30 03:51 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/vm/hvm.c
+    * changed returned type of hb_vmCalcIntWidth() to avoid casting
+
 2025-01-30 03:34 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * include/hbdefs.h
     * added final workarounds for OpenWatcom 2.0 bug in 64bit expressions used
diff --git a/src/vm/hvm.c b/src/vm/hvm.c
index 62581d491d..8f6f879a3e 100644
--- a/src/vm/hvm.c
+++ b/src/vm/hvm.c
@@ -6776,9 +6776,9 @@ void hb_vmPushNumber( double dNumber, int iDec )
       hb_vmPushDouble( dNumber, hb_stackSetStruct()->HB_SET_DECIMALS );
 }
 
-static int hb_vmCalcIntWidth( HB_MAXINT nNumber )
+static HB_USHORT hb_vmCalcIntWidth( HB_MAXINT nNumber )
 {
-   int iWidth;
+   HB_USHORT iWidth;
 
    if( nNumber <= -1000000000L )
    {
@@ -6818,7 +6818,7 @@ static void hb_vmPushIntegerConst( int iNumber )
 
    pItem->type = HB_IT_INTEGER;
    pItem->item.asInteger.value = iNumber;
-   pItem->item.asInteger.length = ( HB_USHORT ) hb_vmCalcIntWidth( iNumber );
+   pItem->item.asInteger.length = hb_vmCalcIntWidth( iNumber );
 }
 #else
 static void hb_vmPushLongConst( long lNumber )
@@ -6830,7 +6830,7 @@ static void hb_vmPushLongConst( long lNumber )
 
    pItem->type = HB_IT_LONG;
    pItem->item.asLong.value = ( HB_MAXINT ) lNumber;
-   pItem->item.asLong.length = ( HB_USHORT ) hb_vmCalcIntWidth( lNumber );
+   pItem->item.asLong.length = hb_vmCalcIntWidth( lNumber );
 }
 #endif
 
@@ -6879,7 +6879,7 @@ static void hb_vmPushLongLongConst( HB_LONGLONG llNumber )
 
    pItem->type = HB_IT_LONG;
    pItem->item.asLong.value = ( HB_MAXINT ) llNumber;
-   pItem->item.asLong.length = ( HB_USHORT ) hb_vmCalcIntWidth( llNumber );
+   pItem->item.asLong.length = hb_vmCalcIntWidth( llNumber );
 }
 #endif