Bugfix the bypass.