Payload length fix