fix to M2