Try to fix the thread model