TEIIDDES-2078 fix