fix crash
more crashes