Fixed m2e setup