Fix subject duplication