Sonar Violation Fix