Fixed issue with ordering S-pairs where some of the components have been retired.