                 bounds = measureTextSize(composeWidth);
                 
                 measuredWidth = _textContainerManager.compositionWidth;
-                measuredHeight = Math.ceil(bounds.height);
+                measuredHeight = Math.ceil(bounds.bottom);
             }
             else if (!isNaN(heightConstraint) || !isNaN(explicitHeight) || 
                      !isNaN(_heightInLines))
             {
                 // if no text, 1 char wide with specified height and grow
-                
-                composeWidth = 
-                    hostFormat.lineBreak == "toFit" ? maxWidth : NaN;
                 
                 if (!isNaN(heightConstraint))
                     composeHeight = heightConstraint;

                }
                else
                {
                    measuredWidth = Math.ceil(bounds.width);               
                    measuredHeight = composeHeight;
                }
            }
            else
            {
                // If toFit line breaks and no text, start at explicitMaxWidth
                // or default to maxWidth.
                // If explicit line breaks and no text, width is NaN

                composeWidth = 
                    hostFormat.lineBreak == "toFit" ? maxWidth : NaN;

                // The composeWidth may be adjusted for minWidth/maxWidth.
                bounds = measureTextSize(composeWidth);

                measuredWidth = Math.ceil(bounds.width);
                measuredHeight = Math.ceil(bounds.height);
            }

            // Clamp the height, except if we're using the explicitHeight.

                    composeHeight = calculateHeightInLines();

                // The composeWidth may be adjusted for minWidth/maxWidth.
                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.bottom > composeHeight)
                {
                    measuredWidth = _textContainerManager.compositionWidth;
                    measuredHeight = composeHeight;
