Extended latest crash fix