Fix double IDs
6.1.5