bug fix crash