Simplyfied the padding expression.
Adding header to be safe.