Fix the ordering, should update after data update