Tentative fix for #922