fixed update changing order