Added pmd - 439 errors