Changed to Sonar 3.7.4