Making Sonar happy