PMD Bug fix