todo: fix subject duplication issue