                 var viewportPreferredW:Number =  viewport.getPreferredBoundsWidth();
                 var viewportContentW:Number = contentSize.x;
                 var viewportW:Number = viewport.getLayoutBoundsWidth();  // "current" size
-                var currentSizeNoHSB:Boolean = !isNaN(viewportW) && ((viewportW + Scroller.SDT) > viewportContentW);
-                if (hAuto && !showHSB && ((viewportPreferredW + Scroller.SDT) <= viewportContentW) && currentSizeNoHSB)
+                var currentSizeNoHSB:Boolean = !isNaN(viewportW) && ((viewportW + SDT) > viewportContentW);
+                if (hAuto && !showHSB && ((viewportPreferredW + SDT) <= viewportContentW) && currentSizeNoHSB)
                     measuredW += viewportW;
                 else
                     measuredW += Math.max(viewportPreferredW, (showHSB) ? hsb.getMinBoundsWidth() : 0);

        else if (vsbVisible && vsbTakeUpSpace && !vsbFits(w, h))  // just trying to show VSB, but it doesn't fit
            vsbVisible = false;
        
        // Reset the viewport's width,height to account for the visible scrollbars, unless
        // the viewport's size was explicitly set, then we just use that.
        

                if (vsb && viewport)
                { 
                    vAuto = true;
                    vsbVisible = (contentH >= (viewportH + SDT));
                }                        
                break;
            
            default:
                vsbVisible = false;
        }
        _canScrollVertically = vsbVisible;
        
        // if in touch mode, only show scrollbars if a scroll is currently in progress
        if (scroller.getStyle("interactionMode") == InteractionMode.TOUCH)
