fixes Sonar issue about Singular field
fixes Sonar issue about Singular field