Fix svace2.2 issue