DF-5328 fixed