Fixed FIFO removal bug