Fix deduplication