Fix bye logic