Fix last remaining critical issue in sonar