Sonar for D8 needs a tweak.