Update PN fork with fix from master