try to fix CDB-3389