enhanced FIFO Buffer handling