Added check whether the issue exists