Another pdn fix

Hopefully this can be merged correctly.