Fix duplication bug