Fixing errors in previous timing 'fix'