Code

fix for crash bug 607557