Actually fix the problem