change: fixed crash issue