Field Matching and DFM bug fix

#885
#894