Resolving update weirdness