Fix bug with wrong Payload struct