fix M26 and M23
Merge pull request #322 from wolfmanjm/upstreamedge

fix M26 and M23