Fix Sonar Issue