Fix the svace 2.2 issue