Fix duplication Issue