Fixes #17562