Fixed update order issue.