Back to the old thread_safe