Try to fix duuplicated keys on recently changes