Fix atomicity svace problem