Merge pull request #394 from ping19/master

Fix game crash