Fix for not setting last_payload