fixed, still need fix bypass cycle and time out