Bug fix in Bypass logic.