Yet another fix for #405.