fix rare fatal error
fix another rare fatal error
Merge pull request #3 from TheBoolean/master

fix rare fatal error
Merge pull request #4 from uldisn/master

Merge pull request #3 from TheBoolean/master