Fixed issue with Tracker FIFO