Merge "multiple pnf fix"