diff --git a/Source/GSThemeDrawing.m b/Source/GSThemeDrawing.m
index 0c2b34555..81817d940 100644
--- a/Source/GSThemeDrawing.m
+++ b/Source/GSThemeDrawing.m
@@ -3497,7 +3497,8 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
       unexpandable = [[NSImage alloc] initWithSize: [expanded size]];
 #endif
     }
-  
+
+  NSLog(@"rowIndex = %ld, numberOfRows = %ld", rowIndex, numberOfRows);
   if (rowIndex >= numberOfRows)
     {
       return;
@@ -3545,11 +3546,8 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
 	}
       else
 	{
-	  id value = nil;
-
-	  value = [ov _objectValueForTableColumn: tb
-					     row: rowIndex];
-	  NSLog(@"value = %@", value);
+	  id value = [ov _objectValueForTableColumn: tb
+						row: rowIndex];
 	  [cell setObjectValue: value];
 	}
   
diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m
index 4c2a62b2e..a37bbe815 100644
--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@@ -464,11 +464,25 @@ static NSImage *unexpandable  = nil;
  */
 - (BOOL) isExpandable: (id)item
 {
-  if (item == nil)
+  BOOL result = NO;
+  
+  if (_theBinding == nil)
     {
-      return NO;
+      if (item == nil)
+	{
+	  result = NO;
+	}
+      else
+	{
+	  result = [_dataSource outlineView: self isItemExpandable: item];
+	}
     }
-  return [_dataSource outlineView: self isItemExpandable: item];
+  else
+    {
+      result = [[item valueForKeyPath: _leafKeyPath] boolValue];
+    }
+  
+  return result;
 }
 
 /**
@@ -1531,7 +1545,7 @@ Also returns the child index relative to this parent. */
   [_editedCell setEditable: _dataSource_editable];
   tb = [_tableColumns objectAtIndex: columnIndex];
   [_editedCell setObjectValue: [self _objectValueForTableColumn: tb
-				     row: rowIndex]];
+							    row: rowIndex]];
 
   // But of course the delegate can mess it up if it wants
   [self _willDisplayCell: _editedCell
@@ -1850,6 +1864,8 @@ Also returns the child index relative to this parent. */
 			    byItem: item];
     }
 
+  NSLog(@"RESULT ======= %@, class = %@", result, NSStringFromClass([result class]));
+  
   return result;
 }