Merge pull request #732 from bslenul/crash-fix