tentative fix for #1826