Fix to support class-ids in eq.