Fixing register value overwriting in address calculation.