Fix m2 creation