fix order error: IndexOutOfBoundException
update order and fix error