fix for #37520