Fix for #18994