Fixed order display issue