fixed what I hope is our last crash bug