Order of update fix.