Fix Bye bug