Try fix for deadlock