fix and multithreading-support