fixes Sonar issue about Singular field