resolve the issue