tentative fix for #403