in the process of fixing crashes