Fixed payload issue.
Merged