Fixed duplicate keys