Patch issue with dbe (see ADTCC-244)