If this was easy to solve, it would have been solved long ago. Instead, it’s an issue that keeps going in circles (fix, regression, fix, regression).
This needs developer work, and it needs to be done in-depth, not just a quick fix. At least, there needs to be an understanding of all the places that use the code; it’s not enough to fix whatever you’re looking at in a given moment, while breaking it on another screen.