Deadlock fixin!