Recent changes seemed to have fixed a crash condition