         // TODO: in the center or right case, we end up calculating percentWidth 
         // twice.  Once here for the contentWidth and once in distributeHeight
         // to size that particular element.
-        if (horizontalAlign != HorizontalAlign.LEFT)
+        if (horizontalAlign == HorizontalAlign.CONTENT_JUSTIFY ||
+           (clipAndEnableScrolling && (horizontalAlign == HorizontalAlign.CENTER ||
+                                       horizontalAlign == HorizontalAlign.RIGHT))) 
         {
             for (var i:int = 0; i < count; i++)
             {

        }
        layoutTarget.measuredWidth = llv.minorSize + hPadding;
                
        layoutTarget.measuredMinWidth = layoutTarget.measuredWidth;
        layoutTarget.measuredMinHeight = layoutTarget.measuredHeight;
    }


            preferredHeight += height;
            preferredWidth = Math.max(preferredWidth, width);
            minHeight += (isNaN(elt.percentHeight)) ? height : elt.getMinBoundsHeight();
            var flexibleWidth:Boolean = !isNaN(elt.percentWidth) || horizontalAlign == HorizontalAlign.JUSTIFY;
            minWidth = Math.max(minWidth, flexibleWidth ? elt.getMinBoundsWidth() : width);

            eltInLayoutCount += 1;
        }
