more places to fix the let-calculationnode gone away.