Fix previous fix...
Merge pull request #858 from kotarou3/crashfix

Fix previous fix...