Try to fix multithreading issue