fixed ID conflicts