Sonar fix: NS.java