Another attempt at fixing crashes.