Tentative fix for #1734