fix some cid stuff in fifo