Quick fix for #1948