Code

Richard's patch for crash bug 402274