Multithreading fix1