diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1831f2f9ae..0d1daaa6ec 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-11-13 22:59 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/strcase.c
+    * casting
+
 2007-11-13 22:22 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/cdpapi.c
     ! fixed bad typo in my last modification
diff --git a/harbour/source/rtl/strcase.c b/harbour/source/rtl/strcase.c
index 6b9facbc57..cab01d04c3 100644
--- a/harbour/source/rtl/strcase.c
+++ b/harbour/source/rtl/strcase.c
@@ -67,11 +67,11 @@ char * hb_strLower( char * szText, ULONG ulLen )
 #ifndef HB_CDP_SUPPORT_OFF
    if( hb_cdp_page->nChars )
       for( i = 0; i < ulLen; i++ )
-         szText[ i ] = (char) hb_cdp_page->s_lower[szText[i]&255];
+         szText[ i ] = ( char ) hb_cdp_page->s_lower[ ( UCHAR ) szText[ i ] ];
    else
 #endif
       for( i = 0; i < ulLen; i++ )
-         szText[ i ] = tolower( (unsigned char) szText[ i ] );
+         szText[ i ] = ( char ) tolower( ( UCHAR ) szText[ i ] );
 
    return szText;
 }
@@ -86,11 +86,11 @@ char * hb_strUpper( char * szText, ULONG ulLen )
 #ifndef HB_CDP_SUPPORT_OFF
    if( hb_cdp_page->nChars )
       for( i = 0; i < ulLen; i++ )
-         szText[ i ] = (char) hb_cdp_page->s_upper[szText[i]&255];
+         szText[ i ] = ( char ) hb_cdp_page->s_upper[ ( UCHAR ) szText[ i ] ];
    else
 #endif
       for( i = 0; i < ulLen; i++ )
-         szText[ i ] = toupper( (unsigned char) szText[ i ] );
+         szText[ i ] = ( char ) toupper( ( UCHAR ) szText[ i ] );
 
    return szText;
 }