Fix according sonar