Quick fix for #2125