Limit the scope of Bypass to be in the same context