DF-4868 fixed on review