DEV-70: fixed duplicate IDs