Tentative fix for #124 (and #125?)