bug fix and opposition DF