Try to fix thread issues