DT-1239 fix