Another crash fix