Fix regression caused by SONAR-5349