ThreadInterruptedException fix