fix crash bug
Merge branch 'master' of github.com:evilnet/x3