Fix bypass scan and motif