small change on the way fifo are managed