add m4 fix
Merge remote-tracking branch 'origin/fixm4'