fix: improve the robustness of the payload extract logic (#1464)

fix: improve the robustness of the payload extract logic (#1464) #647