#39 border-box fix

Added condition for border-box