Resolve the issue