[DF-1234] is fixed