fixing bugs sonar