Major Fix with FIFO