CM sonar fix