Tentative fix for #5