[DF-935] is fixed.