change the log tag and fix a concurrency bug