DF some fix