fixed sonar violation