Merge pull request #361 from TheBlueMatt/2019-07-cmfc-crash