Resolve Sonar issue