Fix with-payload.