Fixed a bug with some uses of calculation fields.