Code

improved fix crash bug #197664