Updated according to change fifo handling.