Adapted to sonar 4.4