Enable Recalculation on Invalidation

Enable Recalculation on Invalidation