Fix handling of some unusual PDBs