SONARCS-465 Fix