#2768 - Fixing recalc, after missed cherry-pick