resolve issues in sonar