Fixed id duplicate