fixing the issue