another attempt at fixing m2