Fixed box sizing issue #20