improved pmd5 compliance