FIXED id1 id2 INSTRUCTOR bug (with and an or)
FIXED id1 id2 INSTRUCTOR bug (with and an or)