Try to fix problem with reporting on sonar