36: Better FIFO detection