Fixed sonar problems