CDB-3680 returning calculated values after import