Correct Sonar critical violation

#345