MVA: Fixed critical sonar issue