Yeah, it's clearly a case of treating the symptom rather than the disease. How to solve the problem in general though I don't know.