Fixed lack of updating 'old' variables