Fixes #18700950639616