Compatibility with Sonar 3.7.3