Fixing another crash bug?