fixed the fifo