Removed the blanking of the global payload and put it in the handler