Merge duplicate fix