fixes #18700950639616