client do_bypass modified