P2N fix
version 86
Merge pull request #268 from Sereri/master

P2N fix, v86