fix D-E-F