[Fixes #58912306] a better way