Fix SVACE issue