      */
     private function calculateElementCount():int
     {
-        if (-1 != _numLayoutElementsCached)
-            return _numLayoutElementsCached;
+        if (-1 != _numElementsCached)
+            return _numElementsCached;
 
         var layoutTarget:GroupBase = target;
-        var count:int = layoutTarget.numLayoutElements;
-        _numLayoutElementsCached = count;
+        var count:int = layoutTarget.numElements;
+        _numElementsCached = count;
         for (var i:int = 0; i < count; i++)
         {
-            var el:ILayoutElement = layoutTarget.getLayoutElementAt(i);
+            var el:ILayoutElement = layoutTarget.getElementAt(i);
             if (!el || !el.includeInLayout)
-                _numLayoutElementsCached--;
-        }
-
-        return _numLayoutElementsCached;
+                _numElementsCached--;
+        }
+
+        return _numElementsCached;
     }
 
     /**


        // Reset the cache
        _tileWidthCached = _tileHeightCached = NaN;
        _numLayoutElementsCached = -1;

        // If actual values have chnaged, notify listeners
        dispatchEventsForActualValueChanges();

            yMinorDelta = 0;
        }

        var count:int = layoutTarget.numElements;
        for (var i:int = 0; i < count; i++)
        {
            var el:ILayoutElement = layoutTarget.getElementAt(i);
            if (!el || !el.includeInLayout)
                continue;

