fix wrong padding handling for subpayloads