fixed CDB-927 CDB-363