Fix for SVACE defects