Put thread_safe in the correct version