Use an atomic instead of a reference to be domain-safe (#221)

Use an atomic instead of a reference to be domain-safe (#221) #621