Actually fix the issue, rather than pretending to