Apply the fix in #41 at the m4 level