Yet another fix for #2359