sonar issue resolved