SONAR-4898 improve reliability