Attempt to fix deadlock