Fix issue with por numbers