Fixed sonar violation