Another crash fix attempt