Fixed updating order issue