Fixed Sonar Violation