Key duplicate fix