Avoid yanked version of thread_safe