Sonar Report Fix