fix bug
fix crash issues