Fix "deadlock" occurring?