Sonar Issue Fix