[3.0] Fix SVACE issue