Fix new Sonar code smell