#171: Fix compatibility with sonar 3.7