Fixed bug that occurs in SM 1.6
Merge pull request #158 from RemyLebeau/patch-8

Fixed bug that occurs in SM 1.6