Maybe-fix for #665.