some more fix..pmd