Test and update fix