Use stable version of PFN
Merge branch 'bugfix'