Calculated fields no longer showing correct values