FIX: FIFO fix