diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0d9b3540b8..63f5b6ee3a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,4 +1,18 @@
-2001-08-21 23:35 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+2001-08-21 16:45 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+
+  * source/rtl/gtcgi/gtcgi.c
+  * source/rtl/gtcrs/gtcrs.c
+  * source/rtl/gtdos/gtdos.c
+  * source/rtl/gtos2/gtos2.c
+  * source/rtl/gtpca/gtpca.c
+  * source/rtl/gtsln/gtsln.c
+  * source/rtl/gtstd/gtstd.c
+  * source/rtl/gtwin/gtwin.c
+    ! Bug fix for clipping at right screen edge.
+    + Minor optimizations for detecting clipping at right and bottom
+      screen edges.
+
+2001-08-21 14:35 UTC-0400 David G. Holm <dholm@jsd-llc.com>
   * source/rtl/gtcrs/gtcrs.c
     * Renamed uRow variable to Row in hb_gt_VertLine(), to match the
       name in the other GT libraries and because it is not unsigned.
diff --git a/harbour/source/rtl/gtcgi/gtcgi.c b/harbour/source/rtl/gtcgi/gtcgi.c
index e267a7889d..91fe700a25 100644
--- a/harbour/source/rtl/gtcgi/gtcgi.c
+++ b/harbour/source/rtl/gtcgi/gtcgi.c
@@ -442,7 +442,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
       }
       if( Right >= hb_gt_GetScreenWidth() )
       {
-         Width -= Right - hb_gt_GetScreenWidth() + 1;
+         Width -= Right - hb_gt_GetScreenWidth();
       }
 
       if( Col <= Right && Col < hb_gt_GetScreenWidth() && Top >= 0 && Top < hb_gt_GetScreenHeight() )
diff --git a/harbour/source/rtl/gtcrs/gtcrs.c b/harbour/source/rtl/gtcrs/gtcrs.c
index 7dbc3b4601..0b37af7ca9 100644
--- a/harbour/source/rtl/gtcrs/gtcrs.c
+++ b/harbour/source/rtl/gtcrs/gtcrs.c
@@ -660,7 +660,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
       }
       if( Right >= hb_gt_GetScreenWidth() )
       {
-         Width -= Right - hb_gt_GetScreenWidth() + 1;
+         Width -= Right - hb_gt_GetScreenWidth();
       }
 
       if( Col <= Right && Col < hb_gt_GetScreenWidth() && Top >= 0 && Top < hb_gt_GetScreenHeight() )
diff --git a/harbour/source/rtl/gtdos/gtdos.c b/harbour/source/rtl/gtdos/gtdos.c
index be46c0e2e8..b7e938f2e1 100644
--- a/harbour/source/rtl/gtdos/gtdos.c
+++ b/harbour/source/rtl/gtdos/gtdos.c
@@ -1132,7 +1132,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
       }
       if( Right >= hb_gt_GetScreenWidth() )
       {
-         Width -= Right - hb_gt_GetScreenWidth() + 1;
+         Width -= Right - hb_gt_GetScreenWidth();
       }
 
       if( Col <= Right && Col < hb_gt_GetScreenWidth() && Top >= 0 && Top < hb_gt_GetScreenHeight() )
diff --git a/harbour/source/rtl/gtos2/gtos2.c b/harbour/source/rtl/gtos2/gtos2.c
index cdd7cc2dbb..1be4944bbf 100644
--- a/harbour/source/rtl/gtos2/gtos2.c
+++ b/harbour/source/rtl/gtos2/gtos2.c
@@ -924,7 +924,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
       }
       if( Right >= hb_gt_GetScreenWidth() )
       {
-         Width -= Right - hb_gt_GetScreenWidth() + 1;
+         Width -= Right - hb_gt_GetScreenWidth();
       }
 
       if( Col <= Right && Col < hb_gt_GetScreenWidth() && Top >= 0 && Top < hb_gt_GetScreenHeight() )
diff --git a/harbour/source/rtl/gtpca/gtpca.c b/harbour/source/rtl/gtpca/gtpca.c
index ef6511522d..6df146629a 100644
--- a/harbour/source/rtl/gtpca/gtpca.c
+++ b/harbour/source/rtl/gtpca/gtpca.c
@@ -525,7 +525,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
       }
       if( Right >= hb_gt_GetScreenWidth() )
       {
-         Width -= Right - hb_gt_GetScreenWidth() + 1;
+         Width -= Right - hb_gt_GetScreenWidth();
       }
 
       if( Col <= Right && Col < hb_gt_GetScreenWidth() && Top >= 0 && Top < hb_gt_GetScreenHeight() )
diff --git a/harbour/source/rtl/gtsln/gtsln.c b/harbour/source/rtl/gtsln/gtsln.c
index 1a7e9ba61e..0ad52e3820 100644
--- a/harbour/source/rtl/gtsln/gtsln.c
+++ b/harbour/source/rtl/gtsln/gtsln.c
@@ -900,7 +900,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
       }
       if( Right >= hb_gt_GetScreenWidth() )
       {
-         Width -= Right - hb_gt_GetScreenWidth() + 1;
+         Width -= Right - hb_gt_GetScreenWidth();
       }
 
       if( Col <= Right && Col < hb_gt_GetScreenWidth() && Top >= 0 && Top < hb_gt_GetScreenHeight() )
diff --git a/harbour/source/rtl/gtstd/gtstd.c b/harbour/source/rtl/gtstd/gtstd.c
index c82b2aa870..4e2d5c37a7 100644
--- a/harbour/source/rtl/gtstd/gtstd.c
+++ b/harbour/source/rtl/gtstd/gtstd.c
@@ -620,7 +620,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
       }
       if( Right >= hb_gt_GetScreenWidth() )
       {
-         Width -= Right - hb_gt_GetScreenWidth() + 1;
+         Width -= Right - hb_gt_GetScreenWidth();
       }
 
       if( Col <= Right && Col < hb_gt_GetScreenWidth() && Top >= 0 && Top < hb_gt_GetScreenHeight() )
diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c
index 816c6cf709..4f1d12f8f9 100644
--- a/harbour/source/rtl/gtwin/gtwin.c
+++ b/harbour/source/rtl/gtwin/gtwin.c
@@ -1237,7 +1237,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
       }
       if( Right >= hb_gt_GetScreenWidth() )
       {
-         Width -= Right - hb_gt_GetScreenWidth() + 1;
+         Width -= Right - hb_gt_GetScreenWidth();
       }
 
       if( Col <= Right && Col < hb_gt_GetScreenWidth() && Top >= 0 && Top < hb_gt_GetScreenHeight() )