fixed crash issue