Payload offset fix