fix for Payload issue that was introduced in Linux port