CRM-11338 further fix on fee amount