Tentative fix for #30