Sonar breaking fix