update thread_safe as 030 is yanked now