quick fix for #6498