Fixed an issue with CPN