fixed CDB-2106