Fix fifo order