Fix subject shredding