added option to disable fifo nonsense