Starting to fix the automated subsetting