Fixes #58452008