                     composeHeight = calculateHeightInLines();
 
                 // The composeWidth may be adjusted for minWidth/maxWidth.
-                bounds = measureTextSize(composeWidth);
+                bounds = measureTextSize(NaN);
                 
                 // Have we already hit the limit with the existing text?  If we
                 // are beyond the composeHeight we can assume we've maxed out on
                 // the compose width as well.
-                if (bounds.height > composeHeight)
+                if (bounds.bottom > composeHeight)
                 {
                     measuredWidth = _textContainerManager.compositionWidth;
                     measuredHeight = composeHeight;

        // Compose only.  The display should not be updated.
        _textContainerManager.compose();

        var bounds:Rectangle = _textContainerManager.getContentBounds();        

        // Remeasure if the composed width was restricted by max width.
        // Typical this is done in validateSize() after returing from measure() 
        // but it impacts our calculations so we need to do it now.
        if (clampWidth && bounds.width > maxWidth)
        {
            _textContainerManager.compositionWidth = composeWidth;
            _textContainerManager.compose();
            bounds = _textContainerManager.getContentBounds();
        }
            
        // If it's an empty text flow, there is one line with one
        // character so the height is good for the line but we
        // need to give it some width.
        
         if (_textContainerManager.getText().length == 0) 
        {

                bounds = measureTextSize(composeWidth);
                
                measuredWidth = _textContainerManager.compositionWidth;
                measuredHeight = Math.ceil(bounds.bottom);
            }
            else if (!isNaN(heightConstraint) || !isNaN(explicitHeight) || 
                     !isNaN(_heightInLines))
            {
                // if no text, 1 char wide with specified height and grow
                
                if (!isNaN(heightConstraint))
                    composeHeight = heightConstraint;
