Fixed multithreading problem
3 files changed