Tentative fix for #3