Finally fixed the issue