fixed id conflicts