fix: improve the robustness of the payload extract logic

fix: improve the robustness of the payload extract logic #644