Fix payload provider handling.