Fix compatibility with sonar 3.5