Fix M17/M18/M84
Merge pull request #191 from wolfmanjm/fix/m17-m18

Fix M17/M18/M84