fixing Critical Sonar Issue