Fix the secondary suppression order to work in all the subsets