Fix sonar cycles