Changed the bypass option