Temp workaround for SVS bug