Fix parsing ambiguity
update bypass table