Final sonar fix