fix update order issue