Actually fix the issue