multithread fix
merge conflict