diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index cd7e7f4d5..64684a730 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -564,9 +564,7 @@ NOT YET IMPLEMENTED
 */
 - (void)reloadDataForRowIndexes:(CPIndexSet)rowIndexes columnIndexes:(CPIndexSet)columnIndexes
 {
-    var oldnumberOfRows = _numberOfRows;
-
-    if (oldnumberOfRows == 0 || oldnumberOfRows !== [self numberOfRows])
+    if ([self _numberOfRowsDidChange])
         [self _reloadDataViews];
     else
         [self _enumerateViewsInRows:rowIndexes columns:columnIndexes usingBlock:function(view, row, column, stop)
@@ -575,6 +573,15 @@ NOT YET IMPLEMENTED
         }];
 }
 
+- (BOOL)_numberOfRowsDidChange
+{
+    var oldnumberOfRows = _numberOfRows;
+
+    _numberOfRows = nil;
+
+    return (oldnumberOfRows !== [self numberOfRows]);
+}
+
 - (void)_reloadDataViews
 {
     //if (!_dataSource)