diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6843f6bf86..eef954c51e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,12 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+  * source/rdd/dbfntx/dbfntx1.c
+    * Bug fixed in tree balancing
+
+2002-04-28 08:50 UTC-0300 Luiz Rafael Culik <culikr@uol.com.br>
+  * source/rtl/listbox.prg
+    * Fixed some warnings
   * source/rtl/dummy.prg
     *Removed reference to ordkeydel() and ordkeyadd()
 
diff --git a/harbour/source/rtl/dbedit.prg b/harbour/source/rtl/dbedit.prg
index cf6e7b965e..a37cfbe92c 100644
--- a/harbour/source/rtl/dbedit.prg
+++ b/harbour/source/rtl/dbedit.prg
@@ -98,6 +98,7 @@ FUNCTION dbEdit(;
    LOCAL cHeading
    LOCAL cBlock
    LOCAL bBlock
+   LOCAL aSubArray
 
    IF !Used()
       RETURN .F.
@@ -132,6 +133,21 @@ FUNCTION dbEdit(;
 
    IF ISARRAY( acColumns )
       nColCount := Len( acColumns )
+      aSubArray:=acColumns[nColCount] // See if is an Array of Array
+
+     IF ISARRAY( aSubArray )
+        nColCount := Len( aSubArray )
+      nPos := 1
+      DO WHILE nPos <= nColCount .AND. ISCHARACTER( aSubArray[ nPos ] ) .AND. !Empty( aSubArray[ nPos ] )
+         nPos++
+      ENDDO
+      nColCount := nPos - 1
+
+      IF nColCount == 0
+         RETURN .F.
+      ENDIF
+      acColumns:=aSubArray
+      else
       nPos := 1
       DO WHILE nPos <= nColCount .AND. ISCHARACTER( acColumns[ nPos ] ) .AND. !Empty( acColumns[ nPos ] )
          nPos++
@@ -141,6 +157,8 @@ FUNCTION dbEdit(;
       IF nColCount == 0
          RETURN .F.
       ENDIF
+
+      endif
    ELSE
       nColCount := FCount()
    ENDIF