CAL-149 fix critical  in sonar