         
         var index:int;
         
-        if (!isNaN(fixedRowHeight))
-        {
-            index = y / (fixedRowHeight + rowGap);
-            return index < _rowCount ? index : -1;
-        }
-        
-        if (rowList.length == 0)
+        if (!variableRowHeight || rowList.length == 0)
         {
             index = y / (defaultRowHeight + rowGap);
             return index < _rowCount ? index : -1;

        
        _minRowHeight = value;
        _defaultRowHeight = Math.max(_defaultRowHeight, _minRowHeight);
        _fixedRowHeight = Math.max(_fixedRowHeight, _minRowHeight);
    }
    
    //----------------------------------

        // Unless setRowHeight is called, return the max cell height for this row
        var height:Number = defaultRowHeight;
        
        if (variableRowHeight)
        {
            var node:GridRowNode = rowList.find(row);
            if (node)
