fix crash
fix check