Merge pull request #1876 from esdrubal/mmf-segfault