[DF-936] is fixed.