Change thread_safe version