tentative fix for #201