Try to fix consequence of SONAR-4119