Fixed problem with FIFO time criteria