Fixed payload issues, thanks to think.pink
Merge branch 'payloadhotfix'
Fixed payload issue, thanks to think.pink for letting us know