Merge pull request #639 from dothebart/fix_cpu_crash