Fixes #18114