Try to fix the thread block (#399)