lock fix + pmd fix