Better wait for next update patch to avoid this manual update issue?