fixes merge
bypass switch was not working properly after merge