Fixed Sonar issue