Crash bug fix.  There are other crash bugs.