Tentative fix for issue #2 - Extension sometimes hang