Fixed payload bug