- fix crashes
