Fix the issue