Issue #96 Migrated to PMD 5.1.0