SONARXML-19: fix implementation