Fix payload handling