Tentative fix for deadlock