diff --git a/ChangeLog b/ChangeLog
index a324f298..1da9d66f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-06 21:06 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Palettes/3Containers/GormNSTableViewInspector.gorm
+	* Palettes/3Containers/GormTableViewAttributesInspector.m: 
+	Correction for bug#15642.
+
 2006-02-03 21:56 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormCore/GormScrollViewAttributesInspector.m
diff --git a/Palettes/3Containers/GormNSTableViewInspector.gorm/data.info b/Palettes/3Containers/GormNSTableViewInspector.gorm/data.info
index 803c1b3f..2d1e5048 100644
Binary files a/Palettes/3Containers/GormNSTableViewInspector.gorm/data.info and b/Palettes/3Containers/GormNSTableViewInspector.gorm/data.info differ
diff --git a/Palettes/3Containers/GormNSTableViewInspector.gorm/objects.gorm b/Palettes/3Containers/GormNSTableViewInspector.gorm/objects.gorm
index 2350207e..f1e4f520 100644
Binary files a/Palettes/3Containers/GormNSTableViewInspector.gorm/objects.gorm and b/Palettes/3Containers/GormNSTableViewInspector.gorm/objects.gorm differ
diff --git a/Palettes/3Containers/GormTableViewAttributesInspector.m b/Palettes/3Containers/GormTableViewAttributesInspector.m
index 92d2ad44..36f4b832 100644
--- a/Palettes/3Containers/GormTableViewAttributesInspector.m
+++ b/Palettes/3Containers/GormTableViewAttributesInspector.m
@@ -107,9 +107,17 @@
     {
       int numCols = [object numberOfColumns];
       int newNumCols = [[sender cellAtIndex: 1] intValue];
+      float rowHeight = [[sender cellAtIndex: 0] floatValue];
+
+      // make sure the minimum height doesn't go below 1.
+      if(rowHeight < 1.0)
+	{
+	  rowHeight = 1.0;
+	  [[sender cellAtIndex: 0] setFloatValue: 1.0]; 
+	}
 
       // add/delete columns based on number in #columns field...
-      [object setRowHeight: [[sender cellAtIndex: 0] intValue] ];
+      [object setRowHeight: rowHeight];
       if(newNumCols > 0)
 	{
 	  if(numCols < newNumCols)
@@ -241,5 +249,4 @@
 {
   [self ok:[aNotification object]];
 }
-
 @end