Fixed SonarExtractorService