One more thing to try to add additional threadsafety