Fixed update race in initialization