Fix missing PCs in PC list after my NPE fix