Really fix deadlock.