fixed id handling