fixed id stuff