SONAR-4692 Fix regression with SONAR-4245