Fix duplication issue