fixed SVACE 2.2 issues