Fixing weirdness with update