Fixed the incorrect multithreading error

essentially reverted changes to commit
0157a3eeb95676ebbcbf89b16082aa095364eaad