Fix SOAAP output for CVE case