Little bug fix at the bypass system