(+) Add: more protection of thread