Changed yanked version of thread_safe