Fixed delayed channels being swapped around