Fix the problem (kind of)