Fixing bugs related to calculation fields.