Properly fix the issue.