Connection sonar issue fix