fix the support for BMGE. Fix the X
fix the order of fD fM