[FIX][FIFO-LIFO] Fix routing issue