Fixed bug where if the order of the PCs were re-ordered, the correct values were not returned