FIFO fix