Tentative fix for #35