Fix for border-box

Added condition for border-box