fixed crash
fixed crash