fixed auto @id stuff to not read ahead too far