Fixed a crash that should have been more common