updated crash fix