SONAR-5167 Fix an issue