Use an atomic instead of a reference to be domain-safe

Use an atomic instead of a reference to be domain-safe #827