Tentative fix for #39.