- fix additional chrashes