[DF-1504] is fixed.