Add guard check for fixing SVACE(WGID=386585)