Followup from review by PMD