diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 396410fc7f..6cff9adf53 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-08-26 17:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbide/edit.prg
+    * Fixed: a small glich in building the aligned line.
+
 2012-08-26 16:32 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/docks.prg
   * contrib/hbide/edit.prg
diff --git a/harbour/contrib/hbide/edit.prg b/harbour/contrib/hbide/edit.prg
index 02c621a6f0..269763aa1f 100644
--- a/harbour/contrib/hbide/edit.prg
+++ b/harbour/contrib/hbide/edit.prg
@@ -1312,9 +1312,9 @@ METHOD IdeEdit:alignAt( cAt )
       nMax += nL - 2
       FOR i := nT TO nB
          cLine := ::getLine( i + 1 )
-         IF ( n := At( cAt, cLine ) ) > 0
-            c1st := SubStr( cLine, 1, n - 1 )
-            c2nd := SubStr( cLine, n )
+         IF ( n := At( cAt, SubStr( cLine, nL, nR - nL + 1 ) ) ) > 0
+            c1st := SubStr( cLine, 1, nL + n - 2 )
+            c2nd := SubStr( cLine, nL + n - 1 )
             cLine := PadR( c1st, nMax ) + c2nd
          ENDIF
          hbide_qReplaceLine( qCursor, i, cLine )