Fix crash issue

-bug fix