Obstacle removal crash fix