Fixing the way bypass was done