-Fixing sonar violation