Before update fix