DT-1138 fix