Improved fifo detection.