bypass bug fixed